[Midnightbsd-cvs] src [12294] trunk/lib/libfetch/fetch.c: fix a buffer overflow in libfetch

[laffer1 at midnightbsd.org]

Revision: 12294
          http://svnweb.midnightbsd.org/src/?rev=12294
Author:   laffer1
Date:     2020-01-28 15:46:46 -0500 (Tue, 28 Jan 2020)
Log Message:
-----------
fix a buffer overflow in libfetch

Modified Paths:
--------------
    trunk/lib/libfetch/fetch.c

Modified: trunk/lib/libfetch/fetch.c
===================================================================
--- trunk/lib/libfetch/fetch.c	2020-01-01 00:05:39 UTC (rev 12293)
+++ trunk/lib/libfetch/fetch.c	2020-01-28 20:46:46 UTC (rev 12294)
@@ -329,6 +329,8 @@
 		}
 		if (dlen-- > 0)
 			*dst++ = c;
+		else
+			return (NULL);
 	}
 	return (s);
 }
@@ -376,11 +378,15 @@
 	if (p && *p == '@') {
 		/* username */
 		q = fetch_pctdecode(u->user, URL, URL_USERLEN);
+		if (q == NULL)
+			goto ouch;
 
 		/* password */
-		if (*q == ':')
+		if (*q == ':') {
 			q = fetch_pctdecode(u->pwd, q + 1, URL_PWDLEN);
-
+			if (q == NULL)
+				goto ouch;
+		}
 		p++;
 	} else {
 		p = URL;