kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes for CVE-2010-3702 and CVE-2010-3704 from openbsd ports and cross

Browse source 
checked with redhat (bugs 595245 and 638960)
This commit is contained in:
tez 2010-10-13 21:29:42 +00:00
parent 9ab95f8e54
commit 59e134c104
4 changed files with 59 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
print/xpdf/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.72 2010/06/13 08:56:04 spz Exp $
# $NetBSD: Makefile,v 1.73 2010/10/13 21:29:42 tez Exp $
DISTNAME= xpdf-3.02
PKGNAME= xpdf-3.02pl4
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \

4
print/xpdf/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.37 2010/06/13 08:56:04 spz Exp $
$NetBSD: distinfo,v 1.38 2010/10/13 21:29:42 tez Exp $
SHA1 (xpdf-3.02.tar.gz) = f9940698840c8a8045677e8be68ab8580903e20a
RMD160 (xpdf-3.02.tar.gz) = e900cb8670b8c430beaa45895fb474411cb1958d
@ -33,3 +33,5 @@ SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58
SHA1 (patch-aq) = 1df0efb9fdde90df0597ba2a56c6030e7446e185
SHA1 (patch-ar) = 5e4719a30a0412d9d731dbef8179c38bba67db94
SHA1 (patch-bb) = d38757d5e4a331d49149acfff897cfe7bc0a5e3b
SHA1 (patch-bc) = 856c7012bf794135aecdb70f726ccec14aa0a7cc
SHA1 (patch-bd) = 8cd3fabac230fcda0d5db39d4b777802f5a75114

23
print/xpdf/patches/patch-bc Normal file
View file

@ -0,0 +1,23 @@
$NetbBSD$
Fix for CVE-2010-3702
from http://www.openbsd.org/cgi-bin/cvsweb/ports/textproc/xpdf/patches/patch-xpdf_Gfx_cc.diff?r1=1.3;r2=1.4
--- xpdf/Gfx.cc.orig 2010-10-13 14:50:46.467717900 -0500
+++ xpdf/Gfx.cc 2010-10-13 15:01:30.882241300 -0500
@@ -443,6 +443,7 @@
xref = xrefA;
subPage = gFalse;
+ parser = NULL;
printCommands = globalParams->getPrintCommands();
// start the resource stack
@@ -485,6 +486,7 @@
xref = xrefA;
subPage = gTrue;
+ parser = NULL;
printCommands = globalParams->getPrintCommands();
// start the resource stack

31
print/xpdf/patches/patch-bd Normal file
View file

@ -0,0 +1,31 @@
$NetBSD: patch-bd,v 1.1 2010/10/13 21:29:43 tez Exp $
Fix for CVE-2010-3704
from http://www.openbsd.org/cgi-bin/cvsweb/ports/textproc/xpdf/patches/patch-fofi_FoFiType1_cc?rev=1.1
--- fofi/FoFiType1.cc.orig 2010-10-13 14:51:21.493696100 -0500
+++ fofi/FoFiType1.cc 2010-10-13 14:58:20.655403000 -0500
@@ -18,6 +18,14 @@
#include "FoFiEncodings.h"
#include "FoFiType1.h"
+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
+# define likely(x) __builtin_expect((x), 1)
+# define unlikely(x) __builtin_expect((x), 0)
+#else
+# define likely(x) (x)
+# define unlikely(x) (x)
+#endif
+
//------------------------------------------------------------------------
// FoFiType1
//------------------------------------------------------------------------
@@ -224,7 +232,7 @@
code = code * 8 + (*p2 - '0');
}
}
- if (code < 256) {
+ if (likely(code < 256 && code >= 0)) {
for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
if (*p == '/') {
++p;