[poppler] poppler/Annot.cc

[GitLab Mirror]

 poppler/Annot.cc |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 67c6f6025fd441e60b3bdcedcfae7121d6f80b30
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Jun 26 22:53:44 2019 +0200

    Add Jose (C) and move error() message as discussed in gitlab

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index 18357a9c..bbccd820 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -23,7 +23,7 @@
 // Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
 // Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein at finjan.com>
-// Copyright (C) 2011, 2013 José Aliste <jaliste at src.gnome.org>
+// Copyright (C) 2011, 2013, 2019 José Aliste <jaliste at src.gnome.org>
 // Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso at hotmail.it>
 // Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2012, 2015 Tobias Koenig <tokoe at kdab.com>
@@ -5833,12 +5833,13 @@ void AnnotInk::initialize(PDFDoc *docA, Dict* dict) {
   } else {
     inkListLength = 0;
     inkList = nullptr;
-    obj1 = dict->lookup("AP");
+    error(errSyntaxError, -1, "Bad Annot Ink List");
 
+    obj1 = dict->lookup("AP");
     // Although InkList is required, it should be ignored
-    // when there is an AP entry in the Annot.
+    // when there is an AP entry in the Annot, so do not fail
+    // when that happens
     if (!obj1.isDict()) {
-      error(errSyntaxError, -1, "Bad Annot Ink List");
       ok = false;
     }
   }