From c3b1c8f85731ef8cec628358f34f368c97a340f4 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Sat, 30 Nov 2019 13:12:48 +0100
Subject: [PATCH] Slightly simplify the XRef cache lookup in `XRef.fetch`

Note that the XRef cache will only hold objects returned through `Parser.getObj`, and indirectly via `Lexer.getObj`. Since neither of those methods will ever return `undefined`, we can simply `assert` that when inserting objects into the cache and thus get rid of one function call when doing cache lookups.

Obviously this won't have a huge effect on performance, however `XRef.fetch` is usually called *a lot* in larger documents and this patch thus cannot hurt.
---
 src/core/obj.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/core/obj.js b/src/core/obj.js
index 253a48666dcf0..ddfeaf82a6cdb 100644
--- a/src/core/obj.js
+++ b/src/core/obj.js
@@ -1636,8 +1636,11 @@ var XRef = (function XRefClosure() {
       }
       const num = ref.num;
 
-      if (this._cacheMap.has(num)) {
-        const cacheEntry = this._cacheMap.get(num);
+      // The XRef cache is populated with objects which are obtained through
+      // `Parser.getObj`, and indirectly via `Lexer.getObj`. Neither of these
+      // methods should ever return `undefined` (note the `assert` calls below).
+      const cacheEntry = this._cacheMap.get(num);
+      if (cacheEntry !== undefined) {
         // In documents with Object Streams, it's possible that cached `Dict`s
         // have not been assigned an `objId` yet (see e.g. issue3115r.pdf).
         if (cacheEntry instanceof Dict && !cacheEntry.objId) {
@@ -1701,6 +1704,11 @@ var XRef = (function XRefClosure() {
         xrefEntry = parser.getObj();
       }
       if (!isStream(xrefEntry)) {
+        if (typeof PDFJSDev === 'undefined' ||
+            PDFJSDev.test('!PRODUCTION || TESTING')) {
+          assert(xrefEntry !== undefined,
+                 'fetchUncompressed: The "xrefEntry" cannot be undefined.');
+        }
         this._cacheMap.set(num, xrefEntry);
       }
       return xrefEntry;
@@ -1753,6 +1761,11 @@ var XRef = (function XRefClosure() {
         }
         const num = nums[i], entry = this.entries[num];
         if (entry && entry.offset === tableOffset && entry.gen === i) {
+          if (typeof PDFJSDev === 'undefined' ||
+              PDFJSDev.test('!PRODUCTION || TESTING')) {
+            assert(obj !== undefined,
+                   'fetchCompressed: The "obj" cannot be undefined.');
+          }
           this._cacheMap.set(num, obj);
         }
       }