diff options
| author | Treeve Jelbert | 2007-08-01 18:08:24 +0200 |
|---|---|---|
| committer | Eric Sandall | 2007-08-01 09:55:28 -0700 |
| commit | 40febe8d0f913a5812c2a8dc844724b8a1009bc8 (patch) | |
| tree | af0e9d9b543953bdd48e38f3a391ac86973d7a09 | |
| parent | 7249351d8509bcf555a649cc9c0b0964efe50030 (diff) | |
koffice - fix CVE-2007-3387
(cherry picked from commit 5bb8d0bf6322682eee87f2354230b8df9bdac1ee)
| -rwxr-xr-x | kde-apps/koffice/DETAILS | 2 | ||||
| -rw-r--r-- | kde-apps/koffice/HISTORY | 5 | ||||
| -rwxr-xr-x | kde-apps/koffice/PRE_BUILD | 3 | ||||
| -rw-r--r-- | kde-apps/koffice/koffice-xpdf-CVE-2007-3387.diff | 20 |
4 files changed, 29 insertions, 1 deletions
diff --git a/kde-apps/koffice/DETAILS b/kde-apps/koffice/DETAILS index 5346f598c2..4aca1972b3 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 f4760409c6..d9537aa894 100644 --- a/kde-apps/koffice/HISTORY +++ b/kde-apps/koffice/HISTORY @@ -1,3 +1,8 @@ +2007-08-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: SECURITY_PATCH++ + * PRE_BUILD, koffice-xpdf-CVE-2007-3387.diff: added + fix bug #13916 + 2007-06-07 George Sherwood <george@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 0000000000..4faa2a05d5 --- /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 0000000000..ded0e07205 --- /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; |