aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2007-07-31 05:59:27 +0800
committerlofi <lofi@FreeBSD.org>2007-07-31 05:59:27 +0800
commit753f9b1b047cf9f1583aa799ed361e6aaf51d2b2 (patch)
tree867659868ef913a04a787cba76cda34b2fce14b3
parentce63eafe1e493850dfc6e2e4cac9c8ab0ca90864 (diff)
downloadfreebsd-ports-gnome-753f9b1b047cf9f1583aa799ed361e6aaf51d2b2.tar.gz
freebsd-ports-gnome-753f9b1b047cf9f1583aa799ed361e6aaf51d2b2.tar.zst
freebsd-ports-gnome-753f9b1b047cf9f1583aa799ed361e6aaf51d2b2.zip
Fix buffer overflow vulnerability in xpdf code.
Security: http://www.kde.org/info/security/advisory-20070730-1.txt Security: CVE-2007-3387
Diffstat
-rw-r--r--editors/calligra/Makefile2
-rw-r--r--editors/calligra/files/patch-koffice-xpdf-CVE-2007-3387.diff20
-rw-r--r--editors/koffice-kde3/Makefile2
-rw-r--r--editors/koffice-kde3/files/patch-koffice-xpdf-CVE-2007-3387.diff20
-rw-r--r--editors/koffice-kde4/Makefile2
-rw-r--r--editors/koffice-kde4/files/patch-koffice-xpdf-CVE-2007-3387.diff20
-rw-r--r--graphics/kdegraphics3/Makefile1
-rw-r--r--graphics/kdegraphics3/files/patch-post-3.5.7-kdegraphics-CVE-2007-3387.diff17
-rw-r--r--graphics/kdegraphics4/Makefile1
-rw-r--r--graphics/kdegraphics4/files/patch-post-3.5.7-kdegraphics-CVE-2007-3387.diff17
10 files changed, 99 insertions, 3 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index f63da77025cc..ec599242a4d1 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,7 +7,7 @@
PORTNAME= koffice
PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
diff --git a/editors/calligra/files/patch-koffice-xpdf-CVE-2007-3387.diff b/editors/calligra/files/patch-koffice-xpdf-CVE-2007-3387.diff
new file mode 100644
index 000000000000..ded0e07205a7
--- /dev/null
+++ b/editors/calligra/files/patch-koffice-xpdf-CVE-2007-3387.diff
@@ -0,0 +1,20 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream
+ predLine = NULL;
+ ok = gFalse;
+
+- if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+- nComps >= INT_MAX / nBits ||
+- width >= INT_MAX / nComps / nBits)
+- return;
+-
+ nVals = width * nComps;
+- if (nVals * nBits + 7 <= 0)
++ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++ nComps >= 4 || nBits > 16 ||
++ width >= INT_MAX / nComps ||
++ nVals >= (INT_MAX - 7) / nBits)
+ return;
+
+ pixBytes = (nComps * nBits + 7) >> 3;
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index f63da77025cc..ec599242a4d1 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= koffice
PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
diff --git a/editors/koffice-kde3/files/patch-koffice-xpdf-CVE-2007-3387.diff b/editors/koffice-kde3/files/patch-koffice-xpdf-CVE-2007-3387.diff
new file mode 100644
index 000000000000..ded0e07205a7
--- /dev/null
+++ b/editors/koffice-kde3/files/patch-koffice-xpdf-CVE-2007-3387.diff
@@ -0,0 +1,20 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream
+ predLine = NULL;
+ ok = gFalse;
+
+- if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+- nComps >= INT_MAX / nBits ||
+- width >= INT_MAX / nComps / nBits)
+- return;
+-
+ nVals = width * nComps;
+- if (nVals * nBits + 7 <= 0)
++ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++ nComps >= 4 || nBits > 16 ||
++ width >= INT_MAX / nComps ||
++ nVals >= (INT_MAX - 7) / nBits)
+ return;
+
+ pixBytes = (nComps * nBits + 7) >> 3;
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index f63da77025cc..ec599242a4d1 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= koffice
PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_KDE}
diff --git a/editors/koffice-kde4/files/patch-koffice-xpdf-CVE-2007-3387.diff b/editors/koffice-kde4/files/patch-koffice-xpdf-CVE-2007-3387.diff
new file mode 100644
index 000000000000..ded0e07205a7
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-koffice-xpdf-CVE-2007-3387.diff
@@ -0,0 +1,20 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream
+ predLine = NULL;
+ ok = gFalse;
+
+- if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+- nComps >= INT_MAX / nBits ||
+- width >= INT_MAX / nComps / nBits)
+- return;
+-
+ nVals = width * nComps;
+- if (nVals * nBits + 7 <= 0)
++ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++ nComps >= 4 || nBits > 16 ||
++ width >= INT_MAX / nComps ||
++ nVals >= (INT_MAX - 7) / nBits)
+ return;
+
+ pixBytes = (nComps * nBits + 7) >> 3;
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index abe09d60e488..e316a72b0b35 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdegraphics
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kdegraphics3/files/patch-post-3.5.7-kdegraphics-CVE-2007-3387.diff b/graphics/kdegraphics3/files/patch-post-3.5.7-kdegraphics-CVE-2007-3387.diff
new file mode 100644
index 000000000000..e28add87e275
--- /dev/null
+++ b/graphics/kdegraphics3/files/patch-post-3.5.7-kdegraphics-CVE-2007-3387.diff
@@ -0,0 +1,17 @@
+Index: kpdf/xpdf/xpdf/Stream.cc
+===================================================================
+--- kpdf/xpdf/xpdf/Stream.cc (revision 689574)
++++ kpdf/xpdf/xpdf/Stream.cc (working copy)
+@@ -411,9 +411,9 @@ StreamPredictor::StreamPredictor(Stream
+
+ nVals = width * nComps;
+ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+- nComps >= INT_MAX / nBits ||
+- width >= INT_MAX / nComps / nBits ||
+- nVals * nBits + 7 < 0) {
++ nComps > gfxColorMaxComps || nBits > 16 ||
++ width >= INT_MAX / nComps ||
++ nVals >= (INT_MAX - 7) / nBits) {
+ return;
+ }
+ pixBytes = (nComps * nBits + 7) >> 3;
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index abe09d60e488..e316a72b0b35 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdegraphics
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/graphics/kdegraphics4/files/patch-post-3.5.7-kdegraphics-CVE-2007-3387.diff b/graphics/kdegraphics4/files/patch-post-3.5.7-kdegraphics-CVE-2007-3387.diff
new file mode 100644
index 000000000000..e28add87e275
--- /dev/null
+++ b/graphics/kdegraphics4/files/patch-post-3.5.7-kdegraphics-CVE-2007-3387.diff
@@ -0,0 +1,17 @@
+Index: kpdf/xpdf/xpdf/Stream.cc
+===================================================================
+--- kpdf/xpdf/xpdf/Stream.cc (revision 689574)
++++ kpdf/xpdf/xpdf/Stream.cc (working copy)
+@@ -411,9 +411,9 @@ StreamPredictor::StreamPredictor(Stream
+
+ nVals = width * nComps;
+ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+- nComps >= INT_MAX / nBits ||
+- width >= INT_MAX / nComps / nBits ||
+- nVals * nBits + 7 < 0) {
++ nComps > gfxColorMaxComps || nBits > 16 ||
++ width >= INT_MAX / nComps ||
++ nVals >= (INT_MAX - 7) / nBits) {
+ return;
+ }
+ pixBytes = (nComps * nBits + 7) >> 3;
generated by cgit (git 2.34.1) at 2025-01-20 08:42:24 +0800