Merge pull request #10441 from Snuffleupagus/indexObjects-more-nested…

…-obj Handle more cases of corrupt PDF files with missing 'endobj' operators, where the "obj" string is immediately followed by the dictionary (PR 9288 follow-up)
mozilla · Jan 12, 2019 · eb7cd88 · eb7cd88
2 parents e4d2a16 + d4a3858
commit eb7cd88
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/core/obj.js b/src/core/obj.js
@@ -1199,7 +1199,7 @@ var XRef = (function XRefClosure() {
  }
  var objRegExp = /^(\d+)\s+(\d+)\s+obj\b/;
  const endobjRegExp = /\bendobj[\b\s]$/;
- const nestedObjRegExp = /\s+(\d+\s+\d+\s+obj[\b\s])$/;
+ const nestedObjRegExp = /\s+(\d+\s+\d+\s+obj[\b\s<])$/;
  const CHECK_CONTENT_LENGTH = 25;
 
  var trailerBytes = new Uint8Array([116, 114, 97, 105, 108, 101, 114]);

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -72,6 +72,7 @@
 !issue9458.pdf
 !issue9915_reduced.pdf
 !issue9940.pdf
+!issue10438_reduced.pdf
 !bad-PageLabels.pdf
 !decodeACSuccessive.pdf
 !filled-background.pdf

diff --git a/test/pdfs/issue10438_reduced.pdf b/test/pdfs/issue10438_reduced.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -826,6 +826,13 @@
  "link": false,
  "type": "eq"
  },
+ { "id": "issue10438",
+ "file": "pdfs/issue10438_reduced.pdf",
+ "md5": "bb26f68493e33af17b256a6ffe777a24",
+ "rounds": 1,
+ "link": false,
+ "type": "eq"
+ },
  { "id": "issue6289",
  "file": "pdfs/issue6289.pdf",
  "md5": "0869f3d147c734ec484ffd492104095d",