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

Type1 fonts pass the sanitizer (again)

Browse Source
This commit is contained in:
Vivien Nicolas 2011-06-25 11:22:28 +02:00
parent 29eae2c468
commit 9d04548db3
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fonts.js
View File

@ -976,6 +976,7 @@ var Type1Parser = function() {
"6": -1, // seac "6": -1, // seac
"7": -1, //sbw "7": -1, //sbw
"11": "sub",
"12": "div", "12": "div",
// callothersubr is a mechanism to make calls on the postscript // callothersubr is a mechanism to make calls on the postscript
@ -1290,6 +1291,9 @@ CFF.prototype = {
"rrcurveto": 8, "rrcurveto": 8,
"callsubr": 10, "callsubr": 10,
"return": 11, "return": 11,
"sub": [12, 11],
"div": [12, 12],
"pop": [1, 12, 18],
"endchar": 14, "endchar": 14,
"rmoveto": 21, "rmoveto": 21,
"hmoveto": 22, "hmoveto": 22,
@ -1323,7 +1327,7 @@ CFF.prototype = {
// entry 3 can be replaced by {} // entry 3 can be replaced by {}
if (index == 3) { if (index == 3) {
if (!data) { if (!data) {
charstring.splice(i - 2, 4, "pop", 3); charstring.splice(i - 2, 4, 3);
i -= 3; i -= 3;
} else { } else {
// 5 to remove the arguments, the callothersubr call and the pop command // 5 to remove the arguments, the callothersubr call and the pop command
@ -1350,12 +1354,15 @@ CFF.prototype = {
charstring.splice(j, 1, 28, command >> 8, command); charstring.splice(j, 1, 28, command >> 8, command);
j+= 2; j+= 2;
} else if (command.charAt) { } else if (command.charAt) {
var command = this.commandsMap[command]; var cmd = this.commandsMap[command];
if (IsArray(command)) { if (!cmd)
charstring.splice(j - 1, 1, command[0], command[1]); error(command);
if (IsArray(cmd)) {
charstring.splice(j, 1, cmd[0], cmd[1]);
j += 1; j += 1;
} else { } else {
charstring[j] = command; charstring[j] = cmd;
} }
} }
} }