commit cbd864b74fe368c1172974c7040c67ddfbc52cf6
author Albert Astals Cid <aacid@kde.org> Mon Jan 08 23:48:57 2018 +0100
committer Albert Astals Cid <aacid@kde.org> Mon Jan 08 23:48:57 2018 +0100
tree 17f90fee4df8351497b10dff311ff33f64351cee
parent 1aaf621f511ca4c235cb30a5ddbf050acd30fe91

Fix abort in Gfx::opBeginMarkedContent if args[1] is not a name

Bug #104468

poppler/Gfx.cc

diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
index ee8f319..60fc98c 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
@@ -5025,18 +5025,19 @@
   char* name0 = args[0].getName();
   if ( strncmp( name0, "OC", 2) == 0 && contentConfig) {
     if ( numArgs >= 2 ) {
-      if (!args[1].isName()) {
-	error(errSyntaxError, getPos(), "Unexpected MC Type: {0:d}", args[1].getType());
-      }
-      char* name1 = args[1].getName();
-      MarkedContentStack *mc = mcStack;
-      mc->kind = gfxMCOptionalContent;
-      Object markedContent = res->lookupMarkedContentNF( name1 );
-      if (!markedContent.isNull()) {
-        bool visible = contentConfig->optContentIsVisible(&markedContent);
-        mc->ocSuppressed = !(visible);
+      if (args[1].isName()) {
+        char* name1 = args[1].getName();
+        MarkedContentStack *mc = mcStack;
+        mc->kind = gfxMCOptionalContent;
+        Object markedContent = res->lookupMarkedContentNF( name1 );
+        if (!markedContent.isNull()) {
+          bool visible = contentConfig->optContentIsVisible(&markedContent);
+          mc->ocSuppressed = !(visible);
+        } else {
+          error(errSyntaxError, getPos(), "DID NOT find {0:s}", name1);
+        }
       } else {
-	error(errSyntaxError, getPos(), "DID NOT find {0:s}", name1);
+	error(errSyntaxError, getPos(), "Unexpected MC Type: {0:d}", args[1].getType());
       }
     } else {
       error(errSyntaxError, getPos(), "insufficient arguments for Marked Content");