Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that Dict_getArray doesn't fail if xref in undefined (PR 6485 follow-up)

Browse Source 
In PR 6485 I somehow missed to account for the case where `xref` is undefined. Since a dictonary can be initialized without providing a reference to an `xref` instance, `Dict_getArray` can thus fail without this added check.
This commit is contained in:
Jonas Jenwald 2015-10-15 11:47:07 +02:00
parent 2096a2a94a
commit 49883439a5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/obj.js
View File

@ -138,7 +138,8 @@ var Dict = (function DictClosure() {
// Same as get(), but dereferences all elements if the result is an Array. // Same as get(), but dereferences all elements if the result is an Array.
getArray: function Dict_getArray(key1, key2, key3) { getArray: function Dict_getArray(key1, key2, key3) {
var value = this.get(key1, key2, key3); var value = this.get(key1, key2, key3);
if (!isArray(value)) { var xref = this.xref;
if (!isArray(value) || !xref) {
return value; return value;
} }
value = value.slice(); // Ensure that we don't modify the Dict data. value = value.slice(); // Ensure that we don't modify the Dict data.
@ -146,7 +147,7 @@ var Dict = (function DictClosure() {
if (!isRef(value[i])) { if (!isRef(value[i])) {
continue; continue;
} }
value[i] = this.xref.fetch(value[i]); value[i] = xref.fetch(value[i]);
} }
return value; return value;
}, },