[poppler] poppler/Form.cc

[GitLab Mirror]

 poppler/Form.cc |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 80de4789e70b69d913362566d2f84642eec9ac51
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Oct 9 10:08:36 2019 +0200

    Fix assert on malformed documents

diff --git a/poppler/Form.cc b/poppler/Form.cc
index 07521526..e5a5d875 100644
--- a/poppler/Form.cc
+++ b/poppler/Form.cc
@@ -1441,7 +1441,12 @@ FormFieldChoice::FormFieldChoice(PDFDoc *docA, Object &&aobj, const Ref refA, Fo
     } else if (obj1.isArray()) {
       for (int i = 0; i < numChoices; i++) {
         for (int j = 0; j < obj1.arrayGetLength(); j++) {
-          Object obj2 = obj1.arrayGet(j);
+          const Object obj2 = obj1.arrayGet(j);
+          if (!obj2.isString()) {
+            error(errSyntaxError, -1, "FormWidgetChoice:: V array contains a non string object");
+            continue;
+          }
+
           bool matches = false;
 
           if (choices[i].exportVal) {