diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2004-12-22 20:06:27 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2004-12-22 20:06:27 +0000 |
| commit | 0d9df9a2aa888462c0e05f08f9bda6a6f6651831 (patch) | |
| tree | e0f8bbcef9ff2b3ffd75b3262fd66c7475ca5947 /app-office | |
| parent | x86 stable and more. See ChangeLog. (Manifest recommit) (diff) | |
| download | gentoo-2-0d9df9a2aa888462c0e05f08f9bda6a6f6651831.tar.gz gentoo-2-0d9df9a2aa888462c0e05f08f9bda6a6f6651831.tar.bz2 gentoo-2-0d9df9a2aa888462c0e05f08f9bda6a6f6651831.zip | |
oops, forgot to merge the diffs
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/koffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff | 31 |
2 files changed, 36 insertions, 1 deletions
diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog index 1095a8427068..c7224fbad5fe 100644 --- a/app-office/koffice/ChangeLog +++ b/app-office/koffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/koffice # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.82 2004/12/22 19:45:09 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.83 2004/12/22 20:06:27 carlo Exp $ + + 22 Dec 2004; Carsten Lohrke <carlo@gentoo.org> + files/koffice_1_3_xpdf_buffer_overflow.diff: + oops, forgot to merge the diffs *koffice-1.3.5-r1 (22 Dec 2004) diff --git a/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff b/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff index b808182c86cc..dfcc74d0ac12 100644 --- a/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff +++ b/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff @@ -16,3 +16,34 @@ diff -u -r1.3 -r1.3.2.1 maskObj.arrayGet(i, &obj1); maskColors[i] = obj1.getInt(); obj1.free(); +=================================================================== +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cc,v +retrieving revision 1.3 +retrieving revision 1.3.2.2 +diff -u -r1.3 -r1.3.2.2 +--- filters/kword/pdf/xpdf/xpdf/GfxState.cc 2003/01/25 23:17:44 1.3 ++++ filters/kword/pdf/xpdf/xpdf/GfxState.cc 2004/12/22 13:50:53 1.3.2.2 +@@ -682,6 +682,11 @@ + } + nCompsA = obj2.getInt(); + obj2.free(); ++ if (nCompsA > gfxColorMaxComps) { ++ error(-1, "ICCBased color space with too many (%d > %d) components", ++ nCompsA, gfxColorMaxComps); ++ nCompsA = gfxColorMaxComps; ++ } + if (dict->lookup("Alternate", &obj2)->isNull() || + !(altA = GfxColorSpace::parse(&obj2))) { + switch (nCompsA) { +@@ -1023,6 +1028,11 @@ + goto err2; + } + nCompsA = obj1.arrayGetLength(); ++ if (nCompsA > gfxColorMaxComps) { ++ error(-1, "DeviceN color space with too many (%d > %d) components", ++ nCompsA, gfxColorMaxComps); ++ nCompsA = gfxColorMaxComps; ++ } + for (i = 0; i < nCompsA; ++i) { + if (!obj1.arrayGet(i, &obj2)->isName()) { + error(-1, "Bad DeviceN color space (names)"); |