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

Merge pull request #7884 from Snuffleupagus/Parser-fetch-indirect-objects-in-filter-arrays

Browse Source 
Ensure that we resolve indirect objects in `Filter` and `DecodeParms` arrays in `parser.js`
This commit is contained in:
Tim van der Meij 2016-12-08 21:59:34 +01:00 committed by GitHub
commit 407dee390a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/parser.js
View File

@ -400,8 +400,11 @@ var Parser = (function ParserClosure() {
var filter = dict.get('Filter', 'F'), filterName;
if (isName(filter)) {
filterName = filter.name;
} else if (isArray(filter) && isName(filter[0])) {
filterName = filter[0].name;
} else if (isArray(filter)) {
var filterZero = this.xref.fetchIfRef(filter[0]);
if (isName(filterZero)) {
filterName = filterZero.name;
}
}
// Parse image stream.
@ -540,7 +543,7 @@ var Parser = (function ParserClosure() {
var params = dict.get('DecodeParms', 'DP');
if (isName(filter)) {
if (isArray(params)) {
params = params[0];
params = this.xref.fetchIfRef(params[0]);
}
return this.makeFilter(stream, filter.name, length, params);
}
@ -550,14 +553,14 @@ var Parser = (function ParserClosure() {
var filterArray = filter;
var paramsArray = params;
for (var i = 0, ii = filterArray.length; i < ii; ++i) {
filter = filterArray[i];
filter = this.xref.fetchIfRef(filterArray[i]);
if (!isName(filter)) {
error('Bad filter name: ' + filter);
}
params = null;
if (isArray(paramsArray) && (i in paramsArray)) {
params = paramsArray[i];
params = this.xref.fetchIfRef(paramsArray[i]);
}
stream = this.makeFilter(stream, filter.name, maybeLength, params);
// after the first stream the length variable is invalid
@ -575,9 +578,6 @@ var Parser = (function ParserClosure() {
return new NullStream(stream);
}
try {
if (params && this.xref) {
params = this.xref.fetchIfRef(params);
}
var xrefStreamStats = this.xref.stats.streamTypes;
if (name === 'FlateDecode' || name === 'Fl') {
xrefStreamStats[StreamType.FLATE] = true;