Commit 8eba89c6 authored by Pino Toscano's avatar Pino Toscano

correctly initialize PSOutputDev::fontFileNameLen and PSOutputDev::psFileNames (#699421)

parent 6a368a93
......@@ -8,6 +8,9 @@ poppler (0.12.4-1.2+squeeze1) UNRELEASED; urgency=low
* Backport upstream commits 7ba15d11e56175601104d125d5e4a47619c224bf and
55940e989701eb9118015e30f4f48eb654fa34c4 to fix GooString::insert;
patch upstream_fix-GooString-insert.diff. (Closes: #693817)
* Correctly initialize PSOutputDev::fontFileNameLen and
PSOutputDev::psFileNames; patch psoutputdev-initialize-vars.diff.
(Closes: #699421)
-- Pino Toscano <pino@debian.org> Wed, 27 Jun 2012 18:36:18 +0200
......
Author: Pino Toscano <pino@debian.org>
Description: initialize PSOutputDev::fontFileNameLen and PSOutputDev::psFileNames
Avoid crashing in ~PSOutputDev when the PSOutputDev instance is not "ok".
Applied-Upstream: not-needed
Last-Update: 2013-01-31
Bug-Debian: http://bugs.debian.org/699421
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -1012,6 +1012,7 @@ PSOutputDev::PSOutputDev(const char *fil
fontIDs = NULL;
fontFileIDs = NULL;
fontFileNames = NULL;
+ fontFileNameLen = 0;
font8Info = NULL;
font16Enc = NULL;
imgIDs = NULL;
@@ -1022,6 +1023,7 @@ PSOutputDev::PSOutputDev(const char *fil
haveTextClip = gFalse;
haveCSPattern = gFalse;
t3String = NULL;
+ psFileNames = NULL;
forceRasterize = forceRasterizeA;
@@ -1077,6 +1079,7 @@ PSOutputDev::PSOutputDev(PSOutputFunc ou
fontIDs = NULL;
fontFileIDs = NULL;
fontFileNames = NULL;
+ fontFileNameLen = 0;
font8Info = NULL;
font16Enc = NULL;
imgIDs = NULL;
@@ -1087,6 +1090,7 @@ PSOutputDev::PSOutputDev(PSOutputFunc ou
haveTextClip = gFalse;
haveCSPattern = gFalse;
t3String = NULL;
+ psFileNames = NULL;
forceRasterize = forceRasterizeA;
......@@ -6,3 +6,4 @@
06_CVE-2010-0207.patch
07_CVE-2010-4653.patch
upstream_fix-GooString-insert.diff
psoutputdev-initialize-vars.diff
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment