commit 112b8ab16128c6e7f80fe7c1890f7b63abd85cce
author Albert Astals Cid <aacid@kde.org> Tue Jun 20 23:51:16 2017 +0200
committer Albert Astals Cid <aacid@kde.org> Wed Jun 21 22:31:19 2017 +0200
tree 23b97fbefd3eda4374eb51042b0d6d2c0644271d
parent 4e68bf998f886cab8a45fa315164d8ba7aa0dee4

Fix crash in broken documents

Fixes bug #101525

poppler/JBIG2Stream.cc

diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index 067fb7f..4853588 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -760,6 +760,10 @@
   JBIG2Bitmap *slice;
   Guint xx, yy;
 
+  if (!data) {
+      return nullptr;
+  }
+
   slice = new JBIG2Bitmap(0, wA, hA);
   if (slice->isOk()) {
     slice->clearToZero();
@@ -3827,6 +3831,10 @@
   JBIG2BitmapPtr tpgrCXPtr2 = {0};
   int x, y, pix;
 
+  if (!refBitmap) {
+      return nullptr;
+  }
+
   bitmap = new JBIG2Bitmap(0, w, h);
   if (!bitmap->isOk())
   {