Date: Wed, 29 Jan 2020 13:11:09 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524545 - in head/ports-mgmt/pkg-devel: . files Message-ID: <202001291311.00TDB9Nm092927@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Jan 29 13:11:09 2020 New Revision: 524545 URL: https://svnweb.freebsd.org/changeset/ports/524545 Log: Import the libfetch patch to the bundled libfetch Added: head/ports-mgmt/pkg-devel/files/patch-libfetch (contents, props changed) Modified: head/ports-mgmt/pkg-devel/Makefile Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Wed Jan 29 13:10:14 2020 (r524544) +++ head/ports-mgmt/pkg-devel/Makefile Wed Jan 29 13:11:09 2020 (r524545) @@ -3,6 +3,7 @@ PORTNAME= pkg DISTVERSION= 1.12.99.4 _PKG_VERSION= ${DISTVERSION} +PORTREVISION= 1 CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel Added: head/ports-mgmt/pkg-devel/files/patch-libfetch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg-devel/files/patch-libfetch Wed Jan 29 13:11:09 2020 (r524545) @@ -0,0 +1,31 @@ +diff --git a/external/libfetch/fetch.c b/external/libfetch/fetch.c +index 47c03a79..df5d5547 100644 +--- external/libfetch/fetch.c ++++ external/libfetch/fetch.c +@@ -332,6 +332,8 @@ fetch_pctdecode(char *dst, const char *src, size_t dlen) + } + if (dlen-- > 0) + *dst++ = c; ++ else ++ return (NULL); + } + return (s); + } +@@ -381,11 +383,15 @@ fetchParseURL(const char *URL) + 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001291311.00TDB9Nm092927>