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

Merge pull request #11805 from Snuffleupagus/issue-11794

Browse Source 
Always skip over any additional, unexpected, RSTx (restart) markers in corrupt JPEG images (issue 11794)
This commit is contained in:
Tim van der Meij 2020-04-16 00:08:58 +02:00 committed by GitHub
commit 96923eb2a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/jpg.js
View File

@ -393,11 +393,17 @@ var JpegImage = (function JpegImageClosure() {
} }
var h, v; var h, v;
while (mcu < mcuExpected) { while (mcu <= mcuExpected) {
// reset interval stuff // reset interval stuff
var mcuToRead = resetInterval var mcuToRead = resetInterval
? Math.min(mcuExpected - mcu, resetInterval) ? Math.min(mcuExpected - mcu, resetInterval)
: mcuExpected; : mcuExpected;
// The `mcuToRead === 0` case should only occur when all of the expected
// MCU data has been already parsed, i.e. when `mcu === mcuExpected`, but
// some corrupt JPEG images contain more data than intended and we thus
// want to skip over any extra RSTx markers below (fixes issue11794.pdf).
if (mcuToRead > 0) {
for (i = 0; i < componentsLength; i++) { for (i = 0; i < componentsLength; i++) {
components[i].pred = 0; components[i].pred = 0;
} }
@ -424,28 +430,24 @@ var JpegImage = (function JpegImageClosure() {
mcu++; mcu++;
} }
} }
}
// find marker // find marker
bitsCount = 0; bitsCount = 0;
fileMarker = findNextFileMarker(data, offset); fileMarker = findNextFileMarker(data, offset);
if (!fileMarker) { if (!fileMarker) {
// Reached the end of the image data without finding an EOI marker. break; // Reached the end of the image data without finding any marker.
break; }
} else if (fileMarker.invalid) { if (fileMarker.invalid) {
// Some bad images seem to pad Scan blocks with e.g. zero bytes, skip // 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). // past those to attempt to find a valid marker (fixes issue4090.pdf).
const partialMsg = mcuToRead > 0 ? "unexpected" : "excessive";
warn( warn(
"decodeScan - unexpected MCU data, current marker is: " + `decodeScan - ${partialMsg} MCU data, current marker is: ${fileMarker.invalid}`
fileMarker.invalid
); );
offset = fileMarker.offset; offset = fileMarker.offset;
} }
var marker = fileMarker && fileMarker.marker; if (fileMarker.marker >= 0xffd0 && fileMarker.marker <= 0xffd7) {
if (!marker || marker <= 0xff00) {
throw new JpegError("decodeScan - a valid marker was not found.");
}
if (marker >= 0xffd0 && marker <= 0xffd7) {
// RSTx // RSTx
offset += 2; offset += 2;
} else { } else {
@ -458,8 +460,7 @@ var JpegImage = (function JpegImageClosure() {
// attempt to find the next valid marker (fixes issue8182.pdf). // attempt to find the next valid marker (fixes issue8182.pdf).
if (fileMarker && fileMarker.invalid) { if (fileMarker && fileMarker.invalid) {
warn( warn(
"decodeScan - unexpected Scan data, current marker is: " + `decodeScan - unexpected Scan data, current marker is: ${fileMarker.invalid}`
fileMarker.invalid
); );
offset = fileMarker.offset; offset = fileMarker.offset;
} }

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

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

8
test/test_manifest.json
View File

@ -2468,6 +2468,14 @@
"link": true, "link": true,
"type": "eq" "type": "eq"
}, },
{ "id": "issue11794",
"file": "pdfs/issue11794.pdf",
"md5": "00d17b10a5fd7c06cddd7a0d2066ecdd",
"rounds": 1,
"link": true,
"lastPage": 1,
"type": "eq"
},
{ {
"id": "bug852992", "id": "bug852992",
"file": "pdfs/bug852992_reduced.pdf", "file": "pdfs/bug852992_reduced.pdf",