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

Merge pull request #21080 from calixteman/recursive_glyf

Browse Source 
Avoid infinite recursion while compiling a glyph
This commit is contained in:
Tim van der Meij 2026-04-12 18:32:03 +02:00 committed by GitHub
commit 88abcefea0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/font_renderer.js
View File

@ -168,7 +168,13 @@ function lookupCmap(ranges, unicode) {
}; };
} }
function compileGlyf(code, cmds, font) { function compileGlyf(code, cmds, font, visitedGlyphs = new Set()) {
if (visitedGlyphs.has(code)) {
warn("compileGlyf: skipping recursive composite glyph reference.");
return;
}
visitedGlyphs.add(code);
function moveTo(x, y) { function moveTo(x, y) {
if (firstPoint) { if (firstPoint) {
// Close the current subpath in adding a straight line to the first point. // Close the current subpath in adding a straight line to the first point.
@ -250,7 +256,7 @@ function compileGlyf(code, cmds, font) {
// TODO: we must use arg1 and arg2 to make something similar to: // TODO: we must use arg1 and arg2 to make something similar to:
// https://github.com/freetype/freetype/blob/edd4fedc5427cf1cf1f4b045e53ff91eb282e9d4/src/truetype/ttgload.c#L1209 // https://github.com/freetype/freetype/blob/edd4fedc5427cf1cf1f4b045e53ff91eb282e9d4/src/truetype/ttgload.c#L1209
} }
compileGlyf(subglyph, cmds, font); compileGlyf(subglyph, cmds, font, visitedGlyphs);
cmds.restore(); cmds.restore();
} }
} while (flags & 0x20); } while (flags & 0x20);
@ -352,6 +358,7 @@ function compileGlyf(code, cmds, font) {
startPoint = endPoint + 1; startPoint = endPoint + 1;
} }
} }
visitedGlyphs.delete(code);
} }
function compileCharString(charStringCode, cmds, font, glyphId) { function compileCharString(charStringCode, cmds, font, glyphId) {

1
test/pdfs/.gitignore vendored
View File

@ -899,3 +899,4 @@
!issue16091.pdf !issue16091.pdf
!issue7821.pdf !issue7821.pdf
!issue21068.pdf !issue21068.pdf
!recursiveCompositGlyf.pdf

BIN
test/pdfs/recursiveCompositGlyf.pdf Normal file
View File

Binary file not shown.

7
test/test_manifest.json
View File

@ -14105,5 +14105,12 @@
"link": true, "link": true,
"rounds": 1, "rounds": 1,
"type": "eq" "type": "eq"
},
{
"id": "recursiveCompositGlyf",
"file": "pdfs/recursiveCompositGlyf.pdf",
"md5": "e4e106d20e4af10d7a5f1a5da02db66f",
"rounds": 1,
"type": "eq"
} }
] ]