Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-07-24 16:07:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove undefStack stuff in the cff parser

Browse Source 
I think it should have been removed with #2527 so it should be useless now.
Because of that stuff, some commands with a wrong number of arguments
weren't stripped out (see the pdf in #13850).
This commit is contained in:
calixteman 2025-12-27 15:34:55 +01:00
parent 33e857995c
commit 1dffcf7f25
No known key found for this signature in database
GPG Key ID: 0C5442631EE0691F
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/core/cff_parser.js
View File

@ -119,8 +119,8 @@ const CharstringValidationData = [
/* 7 */ { id: "vlineto", min: 1, resetStack: true }, /* 7 */ { id: "vlineto", min: 1, resetStack: true },
/* 8 */ { id: "rrcurveto", min: 6, resetStack: true }, /* 8 */ { id: "rrcurveto", min: 6, resetStack: true },
/* 9 */ null, /* 9 */ null,
/* 10 */ { id: "callsubr", min: 1, undefStack: true }, /* 10 */ { id: "callsubr", min: 1 },
/* 11 */ { id: "return", min: 0, undefStack: true }, /* 11 */ { id: "return", min: 0 },
/* 12 */ null, /* 12 */ null,
/* 13 */ null, /* 13 */ null,
/* 14 */ { id: "endchar", min: 0, stackClearing: true }, /* 14 */ { id: "endchar", min: 0, stackClearing: true },
@ -138,7 +138,7 @@ const CharstringValidationData = [
/* 26 */ { id: "vvcurveto", min: 4, resetStack: true }, /* 26 */ { id: "vvcurveto", min: 4, resetStack: true },
/* 27 */ { id: "hhcurveto", min: 4, resetStack: true }, /* 27 */ { id: "hhcurveto", min: 4, resetStack: true },
/* 28 */ null, // shortint /* 28 */ null, // shortint
/* 29 */ { id: "callgsubr", min: 1, undefStack: true }, /* 29 */ { id: "callgsubr", min: 1 },
/* 30 */ { id: "vhcurveto", min: 4, resetStack: true }, /* 30 */ { id: "vhcurveto", min: 4, resetStack: true },
/* 31 */ { id: "hvcurveto", min: 4, resetStack: true }, /* 31 */ { id: "hvcurveto", min: 4, resetStack: true },
]; ];
@ -627,26 +627,24 @@ class CFFParser {
data[j - 1] = value === 1 ? 3 : 23; data[j - 1] = value === 1 ? 3 : 23;
} }
} }
if ("min" in validationCommand) { if (stackSize < validationCommand.min) {
if (!state.undefStack && stackSize < validationCommand.min) { warn(
warn( "Not enough parameters for " +
"Not enough parameters for " + validationCommand.id +
validationCommand.id + "; actual: " +
"; actual: " + stackSize +
stackSize + ", expected: " +
", expected: " + validationCommand.min
validationCommand.min );
);
if (stackSize === 0) { if (stackSize === 0) {
// Just "fix" the outline in replacing command by a endchar: // Just "fix" the outline in replacing command by a endchar:
// it could lead to wrong rendering of some glyphs or not. // it could lead to wrong rendering of some glyphs or not.
// For example, the pdf in #6132 is well-rendered. // For example, the pdf in #6132 is well-rendered.
data[j - 1] = 14; data[j - 1] = 14;
return true; return true;
}
return false;
} }
return false;
} }
if (state.firstStackClearing && validationCommand.stackClearing) { if (state.firstStackClearing && validationCommand.stackClearing) {
state.firstStackClearing = false; state.firstStackClearing = false;
@ -670,15 +668,11 @@ class CFFParser {
validationCommand.stackFn(stack, stackSize); validationCommand.stackFn(stack, stackSize);
} }
stackSize += validationCommand.stackDelta; stackSize += validationCommand.stackDelta;
} else if (validationCommand.stackClearing) { } else if (
validationCommand.stackClearing ||
validationCommand.resetStack
) {
stackSize = 0; stackSize = 0;
} else if (validationCommand.resetStack) {
stackSize = 0;
state.undefStack = false;
} else if (validationCommand.undefStack) {
stackSize = 0;
state.undefStack = true;
state.firstStackClearing = false;
} }
} }
} }
@ -706,7 +700,6 @@ class CFFParser {
callDepth: 0, callDepth: 0,
stackSize: 0, stackSize: 0,
stack: [], stack: [],
undefStack: true,
hints: 0, hints: 0,
firstStackClearing: true, firstStackClearing: true,
seac: null, seac: null,