mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Use charstring as plain text when lengthIV is -1.

Browse source 
Fixes #7769
This commit is contained in:
Brendan Dahl 2017-10-18 14:10:40 -07:00
parent 4c384e151e
commit fcc9943d04
4 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/core/type1_parser.js
View file

@ -150,6 +150,10 @@ var Type1CharString = (function Type1CharStringClosure() {
break;
}
subrNumber = this.stack.pop();
if (!subrs[subrNumber]) {
error = true;
break;
}
error = this.convert(subrs[subrNumber], subrs,
seacAnalysisEnabled);
break;
@ -503,6 +507,15 @@ var Type1Parser = (function Type1ParserClosure() {
return token;
},
readCharStrings: function Type1Parser_readCharStrings(bytes, lenIV) {
if (lenIV === -1) {
// This isn't in the spec, but Adobe's tx program handles -1
// as plain text.
return bytes;
}
return decrypt(bytes, CHAR_STRS_ENCRYPT_KEY, lenIV);
},
/*
* Returns an object containing a Subrs array and a CharStrings
* array extracted from and eexec encrypted block of data
@ -548,7 +561,7 @@ var Type1Parser = (function Type1ParserClosure() {
this.getToken(); // read in 'RD' or '-|'
data = stream.makeSubStream(stream.pos, length);
lenIV = program.properties.privateData['lenIV'];
encoded = decrypt(data.getBytes(), CHAR_STRS_ENCRYPT_KEY, lenIV);
encoded = this.readCharStrings(data.getBytes(), lenIV);
// Skip past the required space and binary data.
stream.skip(length);
this.nextChar();
@ -571,7 +584,7 @@ var Type1Parser = (function Type1ParserClosure() {
this.getToken(); // read in 'RD' or '-|'
data = stream.makeSubStream(stream.pos, length);
lenIV = program.properties.privateData['lenIV'];
encoded = decrypt(data.getBytes(), CHAR_STRS_ENCRYPT_KEY, lenIV);
encoded = this.readCharStrings(data.getBytes(), lenIV);
// Skip past the required space and binary data.
stream.skip(length);
this.nextChar();