head 1.4; access; symbols pkgsrc-2025Q4:1.3.0.174 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.172 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.170 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.168 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.166 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.164 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.162 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.160 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.158 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.156 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.154 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.152 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.150 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.148 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.146 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.144 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.142 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.140 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.138 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.136 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.134 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.132 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.128 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.108 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.130 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.126 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.124 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.122 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.120 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.118 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.116 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.114 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.112 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.110 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.106 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.104 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.102 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.100 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.98 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.96 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.94 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.92 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.90 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.88 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.86 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.84 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.82 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.80 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.78 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.76 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.74 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.72 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.70 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.68 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.66 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.64 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.62 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.60 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.58 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.56 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.54 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.52 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.50 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.48 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.44 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.42 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.40 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.38 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.36 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.34 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.32 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.30 pkgsrc-2008Q1:1.3.0.28 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.26 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.24 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.22 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.20 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.18 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.16 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.14 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.12 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.10 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.8 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.6 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.4 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.4 date 2026.02.19.15.17.03; author wiz; state dead; branches; next 1.3; commitid 8Ay3FTeVj5b520vG; 1.3 date 2004.11.20.22.07.49; author jmmv; state Exp; branches; next 1.2; 1.2 date 2002.10.30.03.09.38; author rh; state dead; branches 1.2.8.1; next 1.1; 1.1 date 2001.03.10.12.37.21; author drochner; state Exp; branches; next ; 1.2.8.1 date 2004.11.24.22.40.34; author salo; state Exp; branches; next ; desc @@ 1.4 log @libxml, xml2: remove libxml (v1!) and its remaining user @ text @$NetBSD: patch-ad,v 1.3 2004/11/20 22:07:49 jmmv Exp $ --- nanoftp.c.orig 2000-07-10 12:16:39.000000000 +0200 +++ nanoftp.c @@@@ -65,6 +65,8 @@@@ static char hostname[100]; #define FTP_GET_PASSWD 331 #define FTP_BUF_SIZE 512 +#define XML_NANO_MAX_URLBUF 4096 + typedef struct xmlNanoFTPCtxt { char *protocol; /* the protocol name */ char *hostname; /* the host name */ @@@@ -203,7 +205,7 @@@@ static void xmlNanoFTPScanURL(void *ctx, const char *URL) { xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; const char *cur = URL; - char buf[4096]; + char buf[XML_NANO_MAX_URLBUF]; int index = 0; int port = 0; @@@@ -221,7 +223,7 @@@@ xmlNanoFTPScanURL(void *ctx, const char } if (URL == NULL) return; buf[index] = 0; - while (*cur != 0) { + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF - 1)) { if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) { buf[index] = 0; ctxt->protocol = xmlMemStrdup(buf); @@@@ -234,7 +236,7 @@@@ xmlNanoFTPScanURL(void *ctx, const char if (*cur == 0) return; buf[index] = 0; - while (1) { + while (index < XML_NANO_MAX_URLBUF - 1) { if (cur[0] == ':') { buf[index] = 0; ctxt->hostname = xmlMemStrdup(buf); @@@@ -263,7 +265,7 @@@@ xmlNanoFTPScanURL(void *ctx, const char else { index = 0; buf[index] = 0; - while (*cur != 0) + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF-1)) buf[index++] = *cur++; buf[index] = 0; ctxt->path = xmlMemStrdup(buf); @@@@ -288,7 +290,7 @@@@ int xmlNanoFTPUpdateURL(void *ctx, const char *URL) { xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; const char *cur = URL; - char buf[4096]; + char buf[XML_NANO_MAX_URLBUF]; int index = 0; int port = 0; @@@@ -301,7 +303,7 @@@@ xmlNanoFTPUpdateURL(void *ctx, const cha if (ctxt->hostname == NULL) return(-1); buf[index] = 0; - while (*cur != 0) { + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF-1)) { if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) { buf[index] = 0; if (strcmp(ctxt->protocol, buf)) @@@@ -353,7 +355,7 @@@@ xmlNanoFTPUpdateURL(void *ctx, const cha else { index = 0; buf[index] = 0; - while (*cur != 0) + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF-1)) buf[index++] = *cur++; buf[index] = 0; ctxt->path = xmlMemStrdup(buf); @@@@ -374,7 +376,7 @@@@ xmlNanoFTPUpdateURL(void *ctx, const cha void xmlNanoFTPScanProxy(const char *URL) { const char *cur = URL; - char buf[4096]; + char buf[XML_NANO_MAX_URLBUF]; int index = 0; int port = 0; @@@@ -393,7 +395,7 @@@@ xmlNanoFTPScanProxy(const char *URL) { #endif if (URL == NULL) return; buf[index] = 0; - while (*cur != 0) { + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF-1)) { if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) { buf[index] = 0; index = 0; @@@@ -828,6 +830,11 @@@@ xmlNanoFTPConnect(void *ctx) { if (hp == NULL) return(-1); + if ((unsigned int) hp->h_length > + sizeof(((struct sockaddr_in *)&ctxt->ftpAddr)->sin_addr)) { + return (-1); + } + /* * Prepare the socket */ @ 1.3 log @Backport security fixes (in the nanohttp and the nanoftp modules) from libxml2 (several buffer overflows). Bump PKGREVISION to 3. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2001/03/10 12:37:21 drochner Exp $ d3 104 a106 9 --- libxml.pc.in.orig Wed Jan 17 17:12:55 2001 +++ libxml.pc.in Wed Jan 17 17:13:29 2001 @@@@ -8,5 +8,5 @@@@ Version: @@VERSION@@ Description: libXML library. Requires: -Libs: -L${libdir} -lxml @@Z_LIBS@@ @@M_LIBS@@ @@LIBS@@ +Libs: -L${libdir} -Wl,-R${libdir} -lxml @@Z_LIBS@@ @@M_LIBS@@ @@LIBS@@ Cflags: @@XML_INCLUDEDIR@@ @@XML_CFLAGS@@ @ 1.2.8.1 log @Pullup ticket 147 - requested by Julio M. Merino Vidal security fix for libxml Module Name: pkgsrc Committed By: jmmv Date: Sat Nov 20 22:07:49 UTC 2004 Modified Files: pkgsrc/textproc/libxml: Makefile buildlink3.mk distinfo Added Files: pkgsrc/textproc/libxml/patches: patch-ad patch-ae Log Message: Backport security fixes (in the nanohttp and the nanoftp modules) from libxml2 (several buffer overflows). Bump PKGREVISION to 3. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2004/11/20 22:07:49 jmmv Exp $ d3 9 a11 104 --- nanoftp.c.orig 2000-07-10 12:16:39.000000000 +0200 +++ nanoftp.c @@@@ -65,6 +65,8 @@@@ static char hostname[100]; #define FTP_GET_PASSWD 331 #define FTP_BUF_SIZE 512 +#define XML_NANO_MAX_URLBUF 4096 + typedef struct xmlNanoFTPCtxt { char *protocol; /* the protocol name */ char *hostname; /* the host name */ @@@@ -203,7 +205,7 @@@@ static void xmlNanoFTPScanURL(void *ctx, const char *URL) { xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; const char *cur = URL; - char buf[4096]; + char buf[XML_NANO_MAX_URLBUF]; int index = 0; int port = 0; @@@@ -221,7 +223,7 @@@@ xmlNanoFTPScanURL(void *ctx, const char } if (URL == NULL) return; buf[index] = 0; - while (*cur != 0) { + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF - 1)) { if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) { buf[index] = 0; ctxt->protocol = xmlMemStrdup(buf); @@@@ -234,7 +236,7 @@@@ xmlNanoFTPScanURL(void *ctx, const char if (*cur == 0) return; buf[index] = 0; - while (1) { + while (index < XML_NANO_MAX_URLBUF - 1) { if (cur[0] == ':') { buf[index] = 0; ctxt->hostname = xmlMemStrdup(buf); @@@@ -263,7 +265,7 @@@@ xmlNanoFTPScanURL(void *ctx, const char else { index = 0; buf[index] = 0; - while (*cur != 0) + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF-1)) buf[index++] = *cur++; buf[index] = 0; ctxt->path = xmlMemStrdup(buf); @@@@ -288,7 +290,7 @@@@ int xmlNanoFTPUpdateURL(void *ctx, const char *URL) { xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; const char *cur = URL; - char buf[4096]; + char buf[XML_NANO_MAX_URLBUF]; int index = 0; int port = 0; @@@@ -301,7 +303,7 @@@@ xmlNanoFTPUpdateURL(void *ctx, const cha if (ctxt->hostname == NULL) return(-1); buf[index] = 0; - while (*cur != 0) { + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF-1)) { if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) { buf[index] = 0; if (strcmp(ctxt->protocol, buf)) @@@@ -353,7 +355,7 @@@@ xmlNanoFTPUpdateURL(void *ctx, const cha else { index = 0; buf[index] = 0; - while (*cur != 0) + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF-1)) buf[index++] = *cur++; buf[index] = 0; ctxt->path = xmlMemStrdup(buf); @@@@ -374,7 +376,7 @@@@ xmlNanoFTPUpdateURL(void *ctx, const cha void xmlNanoFTPScanProxy(const char *URL) { const char *cur = URL; - char buf[4096]; + char buf[XML_NANO_MAX_URLBUF]; int index = 0; int port = 0; @@@@ -393,7 +395,7 @@@@ xmlNanoFTPScanProxy(const char *URL) { #endif if (URL == NULL) return; buf[index] = 0; - while (*cur != 0) { + while ((*cur != 0) && (index < XML_NANO_MAX_URLBUF-1)) { if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) { buf[index] = 0; index = 0; @@@@ -828,6 +830,11 @@@@ xmlNanoFTPConnect(void *ctx) { if (hp == NULL) return(-1); + if ((unsigned int) hp->h_length > + sizeof(((struct sockaddr_in *)&ctxt->ftpAddr)->sin_addr)) { + return (-1); + } + /* * Prepare the socket */ @ 1.1 log @update to 1.8.11. No changelog found, but 1.8.10 isn't available on the distribution site anymore. @ text @d1 1 a1 1 $NetBSD$ @