[poppler] poppler/PSOutputDev.cc

[GitLab Mirror]

 poppler/PSOutputDev.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5eb2dec26dbb575ca3eafd2509ceb1ca2aaa5fd1
Author: Philipp Knechtges <philipp-dev at knechtges.com>
Date:   Thu Dec 3 17:02:49 2020 +0100

    PSOutputDev: fixing two oversights in the rasterization code
    
    This fixes the issue with uninitalized memory valgrind shows in the bug report
    https://gitlab.freedesktop.org/poppler/poppler/-/issues/1002 .

diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index 2471d56b..4eeaf7b3 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -3188,7 +3188,7 @@ bool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/, i
         paperColor[0] = 0xff;
     } else if (processColorFormat == splashModeCMYK8) {
         numComps = 4;
-        paperColor[0] = paperColor[1] = paperColor[2] = paperColor[3] = 0;
+        splashClearColor(paperColor);
 
         // If overprinting is emulated, it is not sufficient to just store the CMYK values in a bitmap.
         // All separation channels need to be stored and collapsed at the end.
@@ -3202,6 +3202,7 @@ bool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/, i
     } else {
         error(errUnimplemented, -1, "Unsupported processColorMode. Falling back to RGB8.");
         processColorFormat = splashModeRGB8;
+        internalColorFormat = processColorFormat;
         numComps = 3;
         paperColor[0] = paperColor[1] = paperColor[2] = 0xff;
     }