⬢ DragonFlyBSD Kernel Audit
DF-2248 / fix.diff
← back to finding ↓ download raw
--- a/sys/libiconv/iconv_xlat.c
+++ b/sys/libiconv/iconv_xlat.c
@@ -83,7 +83,7 @@
 	struct iconv_xlat *dp = (struct iconv_xlat*)d2p;
 	const char *src;
 	char *dst;
-	int n, r;
+	size_t n, r;
 
 	if (inbuf == NULL || *inbuf == NULL || outbuf == NULL || *outbuf == NULL)
 		return 0;
@@ -92,7 +92,7 @@
 	if (convchar == 1)
 		r = n = 1;
 	else
-		r = n = min(*inbytesleft, *outbytesleft);
+		r = n = szmin(*inbytesleft, *outbytesleft);
 	src = *inbuf;
 	dst = *outbuf;
 	while(r--)