Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.12 grimoire by Eric Sandall (fa76f89f4c20ca88968d2d8bce415484cb495793)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.12 grimoire by Eric Sandall (fa76f89f4c20ca88968d2d8bce415484cb495793)
  • Date: Wed, 1 Aug 2007 11:57:30 -0500

GIT changes to stable-0.12 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

VERSION | 2 -
kde-apps/koffice/DETAILS | 2 -
kde-apps/koffice/HISTORY | 5 ++
kde-apps/koffice/PRE_BUILD | 3 +
kde-apps/koffice/koffice-xpdf-CVE-2007-3387.diff | 20
++++++++++
kde-core/kdegraphics/DETAILS | 2 -
kde-core/kdegraphics/HISTORY | 7 +++
kde-core/kdegraphics/PRE_BUILD | 3 +
kde-core/kdegraphics/post-3.5.7-kdegraphics-CVE-2007-3387.diff | 17
++++++++
9 files changed, 58 insertions(+), 3 deletions(-)

New commits:
commit fa76f89f4c20ca88968d2d8bce415484cb495793
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

VERSION: 0.12-4

commit 126027057124716318e895fd99a68377bdaf04db
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kdegraphics - fix CVE-2007-3387
(cherry picked from commit a9a185d01a2c6958f97be4c8cf0f85f2600dac7d)

commit 40febe8d0f913a5812c2a8dc844724b8a1009bc8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

koffice - fix CVE-2007-3387
(cherry picked from commit 5bb8d0bf6322682eee87f2354230b8df9bdac1ee)

diff --git a/VERSION b/VERSION
index de5fd6a..c48c324 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.12-3
+0.12-4
diff --git a/kde-apps/koffice/DETAILS b/kde-apps/koffice/DETAILS
index 5346f59..4aca197 100755
--- a/kde-apps/koffice/DETAILS
+++ b/kde-apps/koffice/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/$SPELL-$VERSION/src/$SOURCE
WEB_SITE=http://www.koffice.org
ENTERED=20020405
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
LICENSE[0]=GPL
KEYWORDS="kde office"
SHORT="Full office suite"
diff --git a/kde-apps/koffice/HISTORY b/kde-apps/koffice/HISTORY
index f476040..d9537aa 100644
--- a/kde-apps/koffice/HISTORY
+++ b/kde-apps/koffice/HISTORY
@@ -1,3 +1,8 @@
+2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD, koffice-xpdf-CVE-2007-3387.diff: added
+ fix bug #13916
+
2007-06-07 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 1.6.3

diff --git a/kde-apps/koffice/PRE_BUILD b/kde-apps/koffice/PRE_BUILD
new file mode 100755
index 0000000..4faa2a0
--- /dev/null
+++ b/kde-apps/koffice/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/koffice-xpdf-CVE-2007-3387.diff
diff --git a/kde-apps/koffice/koffice-xpdf-CVE-2007-3387.diff
b/kde-apps/koffice/koffice-xpdf-CVE-2007-3387.diff
new file mode 100644
index 0000000..ded0e07
--- /dev/null
+++ b/kde-apps/koffice/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/kde-core/kdegraphics/DETAILS b/kde-core/kdegraphics/DETAILS
index 585d720..a558d2f 100755
--- a/kde-core/kdegraphics/DETAILS
+++ b/kde-core/kdegraphics/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
WEB_SITE=http://www.kde.org
ENTERED=20010922
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
LICENSE[0]=GPL
KEYWORDS="kde"
SHORT="Graphics related programs for KDE."
diff --git a/kde-core/kdegraphics/HISTORY b/kde-core/kdegraphics/HISTORY
index 2236432..c8971d1 100644
--- a/kde-core/kdegraphics/HISTORY
+++ b/kde-core/kdegraphics/HISTORY
@@ -1,3 +1,10 @@
+2007-08-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD, post-3.5.7-kdegraphics-CVE-2007-3387.diff
+ see
+ http://www.kde.org/info/security/advisory-20070730-1.txt
+ fixes bug #13916
+
2007-05-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: updated spell to 3.5.7

diff --git a/kde-core/kdegraphics/PRE_BUILD b/kde-core/kdegraphics/PRE_BUILD
new file mode 100755
index 0000000..336c5ff
--- /dev/null
+++ b/kde-core/kdegraphics/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/post-3.5.7-kdegraphics-CVE-2007-3387.diff
diff --git a/kde-core/kdegraphics/post-3.5.7-kdegraphics-CVE-2007-3387.diff
b/kde-core/kdegraphics/post-3.5.7-kdegraphics-CVE-2007-3387.diff
new file mode 100644
index 0000000..e28add8
--- /dev/null
+++ b/kde-core/kdegraphics/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;



  • [SM-Commit] GIT changes to stable-0.12 grimoire by Eric Sandall (fa76f89f4c20ca88968d2d8bce415484cb495793), Eric Sandall, 08/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page