poppler 0.52.0

git-svn-id: svn://tug.org/texlive/trunk@43251 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 100 insertions, 21 deletions

diff --git a/Build/source/libs/poppler/poppler-src/CMakeLists.txt b/Build/source/libs/poppler/poppler-src/CMakeLists.txt
index 5074a1a1740..d36e06e35c7 100644
--- a/Build/source/libs/poppler/poppler-src/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-src/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "51")
+set(POPPLER_MINOR_VERSION "52")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
diff --git a/Build/source/libs/poppler/poppler-src/ChangeLog b/Build/source/libs/poppler/poppler-src/ChangeLog
index b77d9d95a7d..b485fb46a50 100644
--- a/Build/source/libs/poppler/poppler-src/ChangeLog
+++ b/Build/source/libs/poppler/poppler-src/ChangeLog
@@ -1,3 +1,65 @@
+commit baad9bd0406f63cffa8054c5831ccc3cb5d207e3
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Feb 15 23:05:55 2017 +0100
+
+    Update C years
+
+ poppler/Annot.cc           | 2 +-
+ poppler/OptionalContent.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 83d4d3ee56b22ef4c0899514abcfc4c220fb4031
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Feb 13 20:47:05 2017 +0100
+
+    Properly initialize some RichMedia variables in corner cases
+
+    Bug #99767
+
+ poppler/Annot.cc | 31 ++++++++++++++-----------------
+ 1 file changed, 14 insertions(+), 17 deletions(-)
+
+commit 8de4b3595a80d8880b842599cb25ab5fd5367689
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Feb 13 01:15:04 2017 +0100
+
+    Fix assert on reading some OCGs
+
+    Check the object is a ref before calling getRef
+
+    Bug #99768
+
+ poppler/OptionalContent.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 0b7c235c3ebe2a7a8d7bd6bfb22e605bf770a022
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Thu Feb 9 21:23:04 2017 +1030
+
+    pdftocairo.1: typo
+
+ utils/pdftocairo.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e7aad35dcba3449bc8a56de070fea7e09cb64833
+Author: Hubert Figuière <hub@figuiere.net>
+Date:   Tue Jan 17 23:58:00 2017 -0500
+
+    Qt: fix memory leaks found when running tests
+
+    -cleanup objects in tests to fix memory leaks.
+    -optcontent was leaking the headers items
+
+    Bug #99449
+
+ qt4/src/poppler-optcontent-private.h | 2 ++
+ qt4/src/poppler-optcontent.cc        | 3 +++
+ qt4/tests/check_links.cpp            | 2 ++
+ qt5/src/poppler-optcontent-private.h | 2 ++
+ qt5/src/poppler-optcontent.cc        | 3 +++
+ qt5/tests/check_links.cpp            | 2 ++
+ 6 files changed, 14 insertions(+)
+
 commit dc8edecc437f33305257b6cb208dc2da367b7868
 Author: Albert Astals Cid <aacid@kde.org>
 Date:   Sun Jan 15 18:27:49 2017 +0100
diff --git a/Build/source/libs/poppler/poppler-src/NEWS b/Build/source/libs/poppler/poppler-src/NEWS
index 9139ff610cb..cf7de77bf94 100644
--- a/Build/source/libs/poppler/poppler-src/NEWS
+++ b/Build/source/libs/poppler/poppler-src/NEWS
@@ -1,3 +1,19 @@
+Release 0.52.0
+        core:
+         * Fix assert on reading some OCGs. Bug #99768
+         * Properly initialize some RichMedia variables in corner cases. Bug #99767
+
+        qt4:
+         * optcontent structure was leaking the headers items. Bug #99449
+         * Cleanup objects in tests to fix memory leaks. Bug #99449
+
+        qt5:
+         * optcontent structure was leaking the headers items. Bug #99449
+         * Cleanup objects in tests to fix memory leaks. Bug #99449
+
+        utils:
+         * pdftocairo.1: Fix typo
+
 Release 0.51.0
         core:
          * Check for error from NSS in SignatureHandler construct. Bug #99363
diff --git a/Build/source/libs/poppler/poppler-src/configure.ac b/Build/source/libs/poppler/poppler-src/configure.ac
index 90c8b511d4f..5caa8ae5167 100644
--- a/Build/source/libs/poppler/poppler-src/configure.ac
+++ b/Build/source/libs/poppler/poppler-src/configure.ac
@@ -1,5 +1,5 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[51])
+m4_define([poppler_version_minor],[52])
 m4_define([poppler_version_micro],[0])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
diff --git a/Build/source/libs/poppler/poppler-src/poppler/Annot.cc b/Build/source/libs/poppler/poppler-src/poppler/Annot.cc
index 51a80e5d9c2..279f650d186 100644
--- a/Build/source/libs/poppler/poppler-src/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Annot.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2007-2013, 2015, 2016 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2013, 2015-2017 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007-2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
 // Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
@@ -6854,6 +6854,8 @@ AnnotRichMedia::Content::Content(Dict *dict) {
   }
   obj1.free();
 
+  nAssets = 0;
+  assets = NULL;
   if (dict->lookup("Assets", &obj1)->isDict()) {
     Object obj2;
 
@@ -6878,10 +6880,6 @@ AnnotRichMedia::Content::Content(Dict *dict) {
       }
     }
     obj2.free();
-
-  } else {
-    nAssets = 0;
-    assets = NULL;
   }
   obj1.free();
 }
@@ -7044,20 +7042,19 @@ AnnotRichMedia::Instance::Instance(Dict *dict)
 {
   Object obj1;
 
-  if (dict->lookup("Subtype", &obj1)->isName()) {
-    const char *name = obj1.getName();
+  dict->lookup("Subtype", &obj1);
+  const char *name = obj1.isName() ? obj1.getName() : "";
 
-    if (!strcmp(name, "3D")) {
-      type = type3D;
-    } else if (!strcmp(name, "Flash")) {
-      type = typeFlash;
-    } else if (!strcmp(name, "Sound")) {
-      type = typeSound;
-    } else if (!strcmp(name, "Video")) {
-      type = typeVideo;
-    } else {
-      type = typeFlash;
-    }
+  if (!strcmp(name, "3D")) {
+    type = type3D;
+  } else if (!strcmp(name, "Flash")) {
+    type = typeFlash;
+  } else if (!strcmp(name, "Sound")) {
+    type = typeSound;
+  } else if (!strcmp(name, "Video")) {
+    type = typeVideo;
+  } else {
+    type = typeFlash;
   }
   obj1.free();
 
diff --git a/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc
index e0d49bc9a5f..44eef194dda 100644
--- a/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc
@@ -5,7 +5,7 @@
 // Copyright 2007 Brad Hards <bradh@kde.org>
 // Copyright 2008 Pino Toscano <pino@kde.org>
 // Copyright 2008, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright 2008, 2010, 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright 2008, 2010, 2011, 2017 Albert Astals Cid <aacid@kde.org>
 // Copyright 2008 Mark Kaplan <mkaplan@finjan.com>
 //
 // Released under the GPL (version 2, or later, at your option)
@@ -63,6 +63,10 @@ OCGs::OCGs(Object *ocgObject, XRef *xref) :
     OptionalContentGroup *thisOptionalContentGroup = new OptionalContentGroup(ocg.getDict());
     ocg.free();
     ocgList.arrayGetNF(i, &ocg);
+    if (!ocg.isRef()) {
+      ocg.free();
+      break;
+    }
     // TODO: we should create a lookup map from Ref to the OptionalContentGroup
     thisOptionalContentGroup->setRef( ocg.getRef() );
     ocg.free();