diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-01-07 11:46:20 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-01-07 11:46:20 +0000 |
| commit | 84469f1b32cc7d2a9e8cdafab0c882d262dbb36d (patch) | |
| tree | 71d27bfbb1e7e90729a0cda66b441499fc60b65e /app-text/pdftohtml/files | |
| parent | Stable on x86 for security fix. (Manifest recommit) (diff) | |
| download | gentoo-2-84469f1b32cc7d2a9e8cdafab0c882d262dbb36d.tar.gz gentoo-2-84469f1b32cc7d2a9e8cdafab0c882d262dbb36d.tar.bz2 gentoo-2-84469f1b32cc7d2a9e8cdafab0c882d262dbb36d.zip | |
Bug #75200, security fix, stable on x86.
Diffstat (limited to 'app-text/pdftohtml/files')
| -rw-r--r-- | app-text/pdftohtml/files/digest-pdftohtml-0.36-r2 | 1 | ||||
| -rw-r--r-- | app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r2 b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r2 new file mode 100644 index 000000000000..5ae8348e609f --- /dev/null +++ b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r2 @@ -0,0 +1 @@ +MD5 75ad095bb51e1f66c9f7691e6af12f44 pdftohtml-0.36.tar.gz 300922 diff --git a/app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch b/app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch new file mode 100644 index 000000000000..119de236d50b --- /dev/null +++ b/app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch @@ -0,0 +1,37 @@ +*** Gfx.cc.orig Sun Dec 12 16:04:43 2004 +--- Gfx.cc Sun Dec 12 16:05:16 2004 +*************** +*** 2654,2660 **** + haveMask = gFalse; + dict->lookup("Mask", &maskObj); + if (maskObj.isArray()) { +! for (i = 0; i < maskObj.arrayGetLength(); ++i) { + maskObj.arrayGet(i, &obj1); + maskColors[i] = obj1.getInt(); + obj1.free(); +--- 2654,2662 ---- + haveMask = gFalse; + dict->lookup("Mask", &maskObj); + if (maskObj.isArray()) { +! for (i = 0; +! i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; +! ++i) { + maskObj.arrayGet(i, &obj1); + maskColors[i] = obj1.getInt(); + obj1.free(); +*** GfxState.cc.orig Sun Dec 12 16:04:48 2004 +--- GfxState.cc Sun Dec 12 16:06:38 2004 +*************** +*** 708,713 **** +--- 708,718 ---- + } + 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) { |