Fix for CVE-2006-4810 and bump to nb6

This commit is contained in:
adrianp 2006-11-18 15:49:02 +00:00
parent 14cf3a2fd9
commit 4b98bdd4e0
3 changed files with 16 additions and 7 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.65 2006/05/23 11:09:04 rillig Exp $
# $NetBSD: Makefile,v 1.66 2006/11/18 15:49:02 adrianp Exp $
DISTNAME= texinfo-4.8
PKGNAME= g${DISTNAME}
PKGREVISION= 5
PKGREVISION= 6
CATEGORIES= devel sysutils
MASTER_SITES= ${MASTER_SITE_GNU:=texinfo/}
EXTRACT_SUFX= .tar.bz2

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.24 2006/02/11 19:47:13 joerg Exp $
$NetBSD: distinfo,v 1.25 2006/11/18 15:49:02 adrianp Exp $
SHA1 (texinfo-4.8.tar.bz2) = b19e906f7220294c1e8b087d583c50f5c4d7c420
RMD160 (texinfo-4.8.tar.bz2) = 5cb82cd240d1f22da813c7142df8828b4f6f1ea4
@ -9,4 +9,4 @@ SHA1 (patch-ac) = 01baf8634edcecab0b5edaeddf1e38811cab490d
SHA1 (patch-ad) = c5c3374322eb8a2c8dfc7871971b73194ab1b14c
SHA1 (patch-aj) = d9071c62c993550d253c9e1889880d4fccf7d278
SHA1 (patch-ak) = 2cef2ae464ddb5324acae000420017d4faf7b145
SHA1 (patch-al) = e4965a737e27ff6df849f45ca2c99217464efe7d
SHA1 (patch-al) = b55ac4b85f23f11248f9cb66b242be7b4daf46ee

View file

@ -1,8 +1,8 @@
$NetBSD: patch-al,v 1.2 2006/02/11 01:04:19 joerg Exp $
$NetBSD: patch-al,v 1.3 2006/11/18 15:49:02 adrianp Exp $
Security fix for CAN-2005-3001.
Security fix for CAN-2005-3001 and CVE-2006-4810
--- util/texindex.c.orig 2004-04-11 19:56:47.000000000 +0200
--- util/texindex.c.orig 2004-04-11 18:56:47.000000000 +0100
+++ util/texindex.c
@@ -387,14 +387,15 @@ For more information about these matters
/* Return a name for temporary file COUNT. */
@ -47,6 +47,15 @@ Security fix for CAN-2005-3001.
}
@@ -837,7 +845,7 @@ readline (struct linebuffer *linebuffer,
{
buffer = (char *) xrealloc (buffer, linebuffer->size *= 2);
p += buffer - linebuffer->buffer;
- end += buffer - linebuffer->buffer;
+ end = buffer - linebuffer->buffer;
linebuffer->buffer = buffer;
}
if (c < 0 || c == '\n')
@@ -882,7 +890,7 @@ sort_offline (char *infile, off_t total,
for (i = 0; i < ntemps; i++)