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

Re-factor the CFFParser class to use DataViews when reading data

Browse Source
This commit is contained in:
Jonas Jenwald 2026-04-10 17:44:19 +02:00
parent 545b512e74
commit dd9ed2040e
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/cff_parser.js
View File

@ -28,7 +28,6 @@ import {
ISOAdobeCharset, ISOAdobeCharset,
} from "./charsets.js"; } from "./charsets.js";
import { ExpertEncoding, StandardEncoding } from "./encodings.js"; import { ExpertEncoding, StandardEncoding } from "./encodings.js";
import { readInt16 } from "./core_utils.js";
// Maximum subroutine call depth of type 2 charstrings. Matches OTS. // Maximum subroutine call depth of type 2 charstrings. Matches OTS.
const MAX_SUBR_NESTING = 10; const MAX_SUBR_NESTING = 10;
@ -355,6 +354,7 @@ class CFFParser {
} }
parseDict(dict) { parseDict(dict) {
const view = new DataView(dict.buffer, dict.byteOffset, dict.bytesLength);
let pos = 0; let pos = 0;
function parseOperand() { function parseOperand() {
@ -362,14 +362,12 @@ class CFFParser {
if (value === 30) { if (value === 30) {
return parseFloatOperand(); return parseFloatOperand();
} else if (value === 28) { } else if (value === 28) {
value = readInt16(dict, pos); value = view.getInt16(pos);
pos += 2; pos += 2;
return value; return value;
} else if (value === 29) { } else if (value === 29) {
value = dict[pos++]; value = view.getInt32(pos);
value = (value << 8) | dict[pos++]; pos += 4;
value = (value << 8) | dict[pos++];
value = (value << 8) | dict[pos++];
return value; return value;
} else if (value >= 32 && value <= 246) { } else if (value >= 32 && value <= 246) {
return value - 139; return value - 139;
@ -378,7 +376,7 @@ class CFFParser {
} else if (value >= 251 && value <= 254) { } else if (value >= 251 && value <= 254) {
return -((value - 251) * 256) - dict[pos++] - 108; return -((value - 251) * 256) - dict[pos++] - 108;
} }
warn('CFFParser_parseDict: "' + value + '" is a reserved command.'); warn(`CFFParser.parseDict: "${value}" is a reserved command.`);
return NaN; return NaN;
} }
@ -489,6 +487,7 @@ class CFFParser {
if (!data || state.callDepth > MAX_SUBR_NESTING) { if (!data || state.callDepth > MAX_SUBR_NESTING) {
return false; return false;
} }
const view = new DataView(data.buffer, data.byteOffset, data.bytesLength);
let stackSize = state.stackSize; let stackSize = state.stackSize;
const stack = state.stack; const stack = state.stack;
@ -513,7 +512,7 @@ class CFFParser {
} }
} else if (value === 28) { } else if (value === 28) {
// number (16 bit) // number (16 bit)
stack[stackSize] = readInt16(data, j); stack[stackSize] = view.getInt16(j);
j += 2; j += 2;
stackSize++; stackSize++;
} else if (value === 14) { } else if (value === 14) {
@ -539,12 +538,7 @@ class CFFParser {
stackSize++; stackSize++;
} else if (value === 255) { } else if (value === 255) {
// number (32 bit) // number (32 bit)
stack[stackSize] = stack[stackSize] = view.getInt32(j) / 65536;
((data[j] << 24) |
(data[j + 1] << 16) |
(data[j + 2] << 8) |
data[j + 3]) /
65536;
j += 4; j += 4;
stackSize++; stackSize++;
} else if (value === 19 || value === 20) { } else if (value === 19 || value === 20) {