[poppler] 2 commits - poppler/Annot.cc poppler/JBIG2Stream.cc

[Albert Astals Cid]

 poppler/Annot.cc       |    4 +++-
 poppler/JBIG2Stream.cc |    5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 2d72a8bfc87c9bdcea6b617ebd4b3a3684e174e8
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu May 26 17:59:21 2016 +0200

    Initialize nConfigurations and nAssets

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index c20398b..60a827f 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
 // Copyright (C) 2007, 2008 Julien Rebetez <julienr at svn.gnome.org>
-// Copyright (C) 2007-2013, 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007-2013, 2015, 2016 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2007-2013 Carlos Garcia Campos <carlosgc at gnome.org>
 // Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez at gmail.com>
 // Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
@@ -6849,6 +6849,7 @@ AnnotRichMedia::Content::Content(Dict *dict) {
       obj2.free();
     }
   } else {
+    nConfigurations = 0;
     configurations = NULL;
   }
   obj1.free();
@@ -6879,6 +6880,7 @@ AnnotRichMedia::Content::Content(Dict *dict) {
     obj2.free();
 
   } else {
+    nAssets = 0;
     assets = NULL;
   }
   obj1.free();
commit 4e49b3af7d6f731b9da20a9d6e5aa54578f08d3f
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu May 26 17:34:56 2016 +0200

    Fix memory leak on error on JBIG2Stream::readHalftoneRegionSeg

diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index a20c220..9f12d5d 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2006 Raj Kumar <rkumar at archive.org>
 // Copyright (C) 2006 Paul Walmsley <paul at booyaka.com>
-// Copyright (C) 2006-2010, 2012, 2014, 2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2010, 2012, 2014-2016 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2009 David Benjamin <davidben at mit.edu>
 // Copyright (C) 2011 Edward Jiang <ejiang at google.com>
 // Copyright (C) 2012 William Bader <williambader at hotmail.com>
@@ -2770,6 +2770,9 @@ void JBIG2Stream::readHalftoneRegionSeg(Guint segNum, GBool imm,
       if (!(enableSkip && skipBitmap->getPixel(n, m))) {
 	patternBitmap = patternDict->getBitmap(grayImg[i]);
 	if (unlikely(patternBitmap == NULL)) {
+	  delete skipBitmap;
+	  delete bitmap;
+	  gfree(grayImg);
 	  error(errSyntaxError, curStr->getPos(), "Bad pattern bitmap");
 	  return;
 	}