Tweak the heuristic that handles JPEG images with a wildly incorrect SOF (Start of Frame) scanLines parameter (issue 15492)

This commit is contained in:
Jonas Jenwald 2022-09-22 14:04:37 +02:00
parent 784ec3978a
commit f1b0dc6f04
3 changed files with 12 additions and 3 deletions

View File

@ -163,11 +163,11 @@ function decodeScan(
// Heuristic to attempt to handle corrupt JPEG images with too // Heuristic to attempt to handle corrupt JPEG images with too
// large `scanLines` parameter, by falling back to the currently // large `scanLines` parameter, by falling back to the currently
// parsed number of scanLines when it's at least (approximately) // parsed number of scanLines when it's at least (approximately)
// one order of magnitude smaller than expected (fixes // one "half" order of magnitude smaller than expected (fixes
// issue10880.pdf and issue10989.pdf). // issue10880.pdf, issue10989.pdf, issue15492.pdf).
if ( if (
maybeScanLines > 0 && maybeScanLines > 0 &&
Math.round(frame.scanLines / maybeScanLines) >= 10 Math.round(frame.scanLines / maybeScanLines) >= 5
) { ) {
throw new DNLMarkerError( throw new DNLMarkerError(
"Found EOI marker (0xFFD9) while parsing scan data, " + "Found EOI marker (0xFFD9) while parsing scan data, " +

View File

@ -0,0 +1 @@
https://github.com/mozilla/pdf.js/files/9624549/EP_Kandzetovic.pdf

View File

@ -5166,6 +5166,14 @@
"lastPage": 1, "lastPage": 1,
"type": "eq" "type": "eq"
}, },
{ "id": "issue15492",
"file": "pdfs/issue15492.pdf",
"md5": "968d36ef340852a4c0e6fa22ced96798",
"rounds": 1,
"link": true,
"lastPage": 1,
"type": "eq"
},
{ "id": "issue9650", { "id": "issue9650",
"file": "pdfs/issue9650.pdf", "file": "pdfs/issue9650.pdf",
"md5": "20d50bda6b1080b6d9088811299c791e", "md5": "20d50bda6b1080b6d9088811299c791e",