Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle some corrupt/truncated JPEG images that are missing the EOI (End of Image) marker (issue 11052)

Browse Source 
Note that even Adobe Reader cannot render the PDF file completely, which is always a good indication that it's corrupt.
This commit is contained in:
Jonas Jenwald 2019-08-08 10:31:48 +02:00
parent aaef00ce5d
commit 0f78fdb229
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/jpg.js
View File

@ -403,16 +403,19 @@ var JpegImage = (function JpegImageClosure() {
// find marker // find marker
bitsCount = 0; bitsCount = 0;
fileMarker = findNextFileMarker(data, offset); fileMarker = findNextFileMarker(data, offset);
// Some bad images seem to pad Scan blocks with e.g. zero bytes, skip past if (!fileMarker) {
// those to attempt to find a valid marker (fixes issue4090.pdf). // Reached the end of the image data without finding an EOI marker.
if (fileMarker && fileMarker.invalid) { break;
} else if (fileMarker.invalid) {
// Some bad images seem to pad Scan blocks with e.g. zero bytes, skip
// past those to attempt to find a valid marker (fixes issue4090.pdf).
warn('decodeScan - unexpected MCU data, current marker is: ' + warn('decodeScan - unexpected MCU data, current marker is: ' +
fileMarker.invalid); fileMarker.invalid);
offset = fileMarker.offset; offset = fileMarker.offset;
} }
var marker = fileMarker && fileMarker.marker; var marker = fileMarker && fileMarker.marker;
if (!marker || marker <= 0xFF00) { if (!marker || marker <= 0xFF00) {
throw new JpegError('marker was not found'); throw new JpegError('decodeScan - a valid marker was not found.');
} }
if (marker >= 0xFFD0 && marker <= 0xFFD7) { // RSTx if (marker >= 0xFFD0 && marker <= 0xFFD7) { // RSTx
@ -943,7 +946,13 @@ var JpegImage = (function JpegImageClosure() {
offset = nextFileMarker.offset; offset = nextFileMarker.offset;
break; break;
} }
throw new JpegError('unknown marker ' + fileMarker.toString(16)); if (offset > (data.length - 2)) {
warn('JpegImage.parse - reached the end of the image data ' +
'without finding an EOI marker (0xFFD9).');
break markerLoop;
}
throw new JpegError('JpegImage.parse - unknown marker: ' +
fileMarker.toString(16));
} }
fileMarker = readUint16(); fileMarker = readUint16();
} }

1
test/pdfs/issue11052.pdf.link Normal file
View File

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

7
test/test_manifest.json
View File

@ -3480,6 +3480,13 @@
"link": true, "link": true,
"type": "eq" "type": "eq"
}, },
{ "id": "issue11052",
"file": "pdfs/issue11052.pdf",
"md5": "67c20e5bec51183c9283baa0cd49593f",
"rounds": 1,
"link": true,
"type": "eq"
},
{ "id": "bug1108753", { "id": "bug1108753",
"file": "pdfs/bug1108753.pdf", "file": "pdfs/bug1108753.pdf",
"md5": "a7aaf92d55b4602afb0ca3d75198b56b", "md5": "a7aaf92d55b4602afb0ca3d75198b56b",