commit 939465c40902d72e0c05d4f3a27ee67e4a007ed7
author Albert Astals Cid <aacid@kde.org> Tue Sep 19 21:19:03 2017 +0200
committer Albert Astals Cid <aacid@kde.org> Tue Sep 19 21:19:03 2017 +0200
tree cc4195192f9870cbd72bee8a200b721e1181a502
parent a8aa61f774503c9ebd840e148c4fa31a6959600d

Fix crash in broken files

Bug #102854

poppler/Stream.cc

diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index f4eda85..0ad602c 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -454,11 +454,10 @@
     } else {
       imgLineSize = nVals;
     }
-    if (width > INT_MAX / nComps) {
-      // force a call to gmallocn(-1,...), which will throw an exception
+    if (nComps <= 0 || width > INT_MAX / nComps) {
       imgLineSize = -1;
     }
-    imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
+    imgLine = (Guchar *)gmallocn_checkoverflow(imgLineSize, sizeof(Guchar));
   }
   imgIdx = nVals;
 }