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

Merge pull request #4907 from CodingFabian/fix-4906

Browse Source 
add object id to streams to prevent infinite loops.
This commit is contained in:
Yury Delendik 2014-06-10 08:56:25 -05:00
commit fc85cfdb83
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/evaluator.js
View File

@ -100,6 +100,13 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
if (!isStream(xObject)) { if (!isStream(xObject)) {
continue; continue;
} }
if (xObject.dict.objId) {
if (processed[xObject.dict.objId]) {
// stream has objId and is processed already
continue;
}
processed[xObject.dict.objId] = true;
}
var xResources = xObject.dict.get('Resources'); var xResources = xObject.dict.get('Resources');
// Checking objId to detect an infinite loop. // Checking objId to detect an infinite loop.
if (isDict(xResources) && if (isDict(xResources) &&

5
src/core/obj.js
View File

@ -1175,9 +1175,10 @@ var XRef = (function XRefClosure() {
} else { } else {
xrefEntry = this.fetchCompressed(xrefEntry, suppressEncryption); xrefEntry = this.fetchCompressed(xrefEntry, suppressEncryption);
} }
if (isDict(xrefEntry)){
if (isDict(xrefEntry)) {
xrefEntry.objId = 'R' + ref.num + '.' + ref.gen; xrefEntry.objId = 'R' + ref.num + '.' + ref.gen;
} else if (isStream(xrefEntry)) {
xrefEntry.dict.objId = 'R' + ref.num + '.' + ref.gen;
} }
return xrefEntry; return xrefEntry;
}, },