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

Strip out a reserved operator (9) from CFF char strings (fixes issue #15784)

Browse Source
This commit is contained in:
Calixte Denizet 2022-12-16 11:51:23 +01:00
parent b518d93b45
commit f80880ccaa
3 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/core/cff_parser.js
View File

@ -108,38 +108,38 @@ const CFFStandardStrings = [
const NUM_STANDARD_CFF_STRINGS = 391; const NUM_STANDARD_CFF_STRINGS = 391;
const CharstringValidationData = [ const CharstringValidationData = [
null, /* 0 */ null,
{ id: "hstem", min: 2, stackClearing: true, stem: true }, /* 1 */ { id: "hstem", min: 2, stackClearing: true, stem: true },
null, /* 2 */ null,
{ id: "vstem", min: 2, stackClearing: true, stem: true }, /* 3 */ { id: "vstem", min: 2, stackClearing: true, stem: true },
{ id: "vmoveto", min: 1, stackClearing: true }, /* 4 */ { id: "vmoveto", min: 1, stackClearing: true },
{ id: "rlineto", min: 2, resetStack: true }, /* 5 */ { id: "rlineto", min: 2, resetStack: true },
{ id: "hlineto", min: 1, resetStack: true }, /* 6 */ { id: "hlineto", min: 1, resetStack: true },
{ id: "vlineto", min: 1, resetStack: true }, /* 7 */ { id: "vlineto", min: 1, resetStack: true },
{ id: "rrcurveto", min: 6, resetStack: true }, /* 8 */ { id: "rrcurveto", min: 6, resetStack: true },
null, /* 9 */ null,
{ id: "callsubr", min: 1, undefStack: true }, /* 10 */ { id: "callsubr", min: 1, undefStack: true },
{ id: "return", min: 0, undefStack: true }, /* 11 */ { id: "return", min: 0, undefStack: true },
null, // 12 /* 12 */ null,
null, /* 13 */ null,
{ id: "endchar", min: 0, stackClearing: true }, /* 14 */ { id: "endchar", min: 0, stackClearing: true },
null, /* 15 */ null,
null, /* 16 */ null,
null, /* 17 */ null,
{ id: "hstemhm", min: 2, stackClearing: true, stem: true }, /* 18 */ { id: "hstemhm", min: 2, stackClearing: true, stem: true },
{ id: "hintmask", min: 0, stackClearing: true }, /* 19 */ { id: "hintmask", min: 0, stackClearing: true },
{ id: "cntrmask", min: 0, stackClearing: true }, /* 20 */ { id: "cntrmask", min: 0, stackClearing: true },
{ id: "rmoveto", min: 2, stackClearing: true }, /* 21 */ { id: "rmoveto", min: 2, stackClearing: true },
{ id: "hmoveto", min: 1, stackClearing: true }, /* 22 */ { id: "hmoveto", min: 1, stackClearing: true },
{ id: "vstemhm", min: 2, stackClearing: true, stem: true }, /* 23 */ { id: "vstemhm", min: 2, stackClearing: true, stem: true },
{ id: "rcurveline", min: 8, resetStack: true }, /* 24 */ { id: "rcurveline", min: 8, resetStack: true },
{ id: "rlinecurve", min: 8, resetStack: true }, /* 25 */ { id: "rlinecurve", min: 8, resetStack: true },
{ id: "vvcurveto", min: 4, resetStack: true }, /* 26 */ { id: "vvcurveto", min: 4, resetStack: true },
{ id: "hhcurveto", min: 4, resetStack: true }, /* 27 */ { id: "hhcurveto", min: 4, resetStack: true },
null, // shortint /* 28 */ null, // shortint
{ id: "callgsubr", min: 1, undefStack: true }, /* 29 */ { id: "callgsubr", min: 1, undefStack: true },
{ id: "vhcurveto", min: 4, resetStack: true }, /* 30 */ { id: "vhcurveto", min: 4, resetStack: true },
{ id: "hvcurveto", min: 4, resetStack: true }, /* 31 */ { id: "hvcurveto", min: 4, resetStack: true },
]; ];
const CharstringValidationData12 = [ const CharstringValidationData12 = [
@ -489,7 +489,7 @@ class CFFParser {
let stackSize = state.stackSize; let stackSize = state.stackSize;
const stack = state.stack; const stack = state.stack;
const length = data.length; let length = data.length;
for (let j = 0; j < length; ) { for (let j = 0; j < length; ) {
const value = data[j++]; const value = data[j++];
@ -601,6 +601,12 @@ class CFFParser {
// So just replace it by endchar command to make OTS happy. // So just replace it by endchar command to make OTS happy.
data[j - 1] = 14; data[j - 1] = 14;
validationCommand = CharstringValidationData[14]; validationCommand = CharstringValidationData[14];
} else if (value === 9) {
// Not a valid value.
data.copyWithin(j - 1, j, -1);
j -= 1;
length -= 1;
continue;
} else { } else {
validationCommand = CharstringValidationData[value]; validationCommand = CharstringValidationData[value];
} }
@ -673,6 +679,9 @@ class CFFParser {
} }
} }
} }
if (length < data.length) {
data.fill(/* endchar = */ 14, length);
}
state.stackSize = stackSize; state.stackSize = stackSize;
return true; return true;
} }

2
test/pdfs/issue15784.pdf.link Normal file
View File

@ -0,0 +1,2 @@
https://github.com/mozilla/pdf.js/files/10154659/RE93815363.pdf

8
test/test_manifest.json
View File

@ -7275,5 +7275,13 @@
"value": "x2" "value": "x2"
} }
} }
},
{
"id": "issue15784",
"file": "pdfs/issue15784.pdf",
"md5": "6e4fce8e36d960955a7476b862f58939",
"rounds": 1,
"link": true,
"type": "eq"
} }
] ]