mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Merge pull request #12063 from Snuffleupagus/issue-10989

Browse source 
Tweak the heuristic, in `src/core/jpg.js`, that handles JPEG images with a wildly incorrect SOF (Start of Frame) `scanLines` parameter (issue 10989)
This commit is contained in:
Tim van der Meij 2020-07-11 00:05:11 +02:00 • committed by GitHub
commit 7dabc5ecc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/jpg.js
View file

@ -163,12 +163,16 @@ var JpegImage = (function JpegImageClosure() {
} else if (nextByte === /* EOI = */ 0xd9) {
if (parseDNLMarker) {
// NOTE: only 8-bit JPEG images are supported in this decoder.
const maybeScanLines = blockRow * 8;
const maybeScanLines = blockRow * (frame.precision === 8 ? 8 : 0);
// Heuristic to attempt to handle corrupt JPEG images with too
// large `scanLines` parameter, by falling back to the currently
// parsed number of scanLines when it's at least one order of
// magnitude smaller than expected (fixes issue10880.pdf).
if (maybeScanLines > 0 && maybeScanLines < frame.scanLines / 10) {
// parsed number of scanLines when it's at least (approximately)
// one order of magnitude smaller than expected (fixes
// issue10880.pdf and issue10989.pdf).
if (
maybeScanLines > 0 &&
Math.round(frame.scanLines / maybeScanLines) >= 10
) {
throw new DNLMarkerError(
"Found EOI marker (0xFFD9) while parsing scan data, " +
"possibly caused by incorrect `scanLines` parameter",