commit e4f4cbddd11ae6386985879187007fa5add43624
author Albert Astals Cid <aacid@kde.org> Tue Jun 12 09:32:57 2018 +0200
committer Albert Astals Cid <aacid@kde.org> Tue Jun 12 09:32:57 2018 +0200
tree 6282a01b36be3eb5dc936f4fc5ff030517259c79
parent adb7cac1b787b35c4f5d25e0441e459ab92d0469

StreamPredictor: Move pixBytes calculation after checks

fixes oss-fuzz/8835

poppler/Stream.cc

diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index 5e5eb33..21bd3b9 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -572,7 +572,6 @@
   ok = gFalse;
 
   nVals = width * nComps;
-  pixBytes = (nComps * nBits + 7) >> 3;
   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
       nComps > gfxColorMaxComps ||
       nBits > 16 ||
@@ -580,6 +579,7 @@
       nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes
     return;
   }
+  pixBytes = (nComps * nBits + 7) >> 3;
   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
   predLine = (Guchar *)gmalloc(rowBytes);
   memset(predLine, 0, rowBytes);