From d4a3858ed5c5f4a31a7089a33c00116eecd5b8bd Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Thu, 10 Jan 2019 17:49:33 +0100
Subject: [PATCH] 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)

---
 src/core/obj.js                  |  2 +-
 test/pdfs/.gitignore             |  1 +
 test/pdfs/issue10438_reduced.pdf | 73 ++++++++++++++++++++++++++++++++
 test/test_manifest.json          |  7 +++
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 test/pdfs/issue10438_reduced.pdf

diff --git a/src/core/obj.js b/src/core/obj.js
index c47d90621..12e268466 100644
--- 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
index 58c294e31..f1f0bd85c 100644
--- 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
new file mode 100644
index 000000000..e067d58dc
--- /dev/null
+++ b/test/pdfs/issue10438_reduced.pdf
@@ -0,0 +1,73 @@
+%PDF-1.7
+%âãÏÓ
+1 0 obj 
+<<
+/Title (Issue 10438)
+/Author (Snuffleupagus)
+>>
+2 0 obj<<
+/Pages 3 0 R
+/Type /Catalog
+>>
+endobj 
+3 0 obj 
+<<
+/Kids [4 0 R]
+/Count 1
+/Type /Pages
+>>
+endobj 
+4 0 obj 
+<<
+/Parent 3 0 R
+/MediaBox [0 0 200 50]
+/Resources 
+<<
+/Font 
+<<
+/F1 5 0 R
+>>
+>>
+/Contents 6 0 R
+/Type /Page
+>>
+endobj 
+5 0 obj 
+<<
+/BaseFont /Times-Roman
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/Type /Font
+>>
+endobj 
+6 0 obj 
+<<
+/Length 41
+>>
+stream
+BT
+10 20 TD
+/F1 20 Tf
+(Issue 10438) Tj
+ET
+
+endstream 
+endobj xref
+0 7
+0000000000 65535 f 
+0000000001 00000 n 
+0000000002 00000 n 
+0000000003 00000 n 
+0000000004 00000 n 
+0000000005 00000 n 
+0000000006 00000 n 
+trailer
+
+<<
+/Info 1 0 R
+/Root 2 0 R
+/Size 7
+>>
+startxref
+491
+%%EOF
diff --git a/test/test_manifest.json b/test/test_manifest.json
index e88746345..f3aaffd80 100644
--- 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",