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

Simplify the handling of unsupported/incorrect markers in src/core/jpg.js

Browse source 
- Re-factor the "incorrect encoding" check, since this can be easily achieved using the general `findNextFileMarker` helper function (with a suitable `startPos` argument).

 - Tweak a condition, to make it easier to see that the end of the data has been reached.

 - Add a reference test for issue 1877, since it's what prompted the "incorrect encoding" check.
This commit is contained in:
Jonas Jenwald 2020-01-13 13:32:23 +01:00
parent 3775b711ed
commit 13930e5202
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/core/jpg.js
View file

@ -1031,17 +1031,14 @@ var JpegImage = (function JpegImageClosure() {
break;
default:
if (
data[offset - 3] === 0xff &&
data[offset - 2] >= 0xc0 &&
data[offset - 2] <= 0xfe
) {
// could be incorrect encoding -- last 0xFF byte of the previous
// block was eaten by the encoder
offset -= 3;
break;
}
const nextFileMarker = findNextFileMarker(data, offset - 2);
// Could be incorrect encoding -- the last 0xFF byte of the previous
// block could have been eaten by the encoder, hence we fallback to
// `startPos = offset - 3` when looking for the next valid marker.
const nextFileMarker = findNextFileMarker(
data,
/* currentPos = */ offset - 2,
/* startPos = */ offset - 3
);
if (nextFileMarker && nextFileMarker.invalid) {
warn(
"JpegImage.parse - unexpected data, current marker is: " +
@ -1050,7 +1047,7 @@ var JpegImage = (function JpegImageClosure() {
offset = nextFileMarker.offset;
break;
}
if (offset > data.length - 2) {
if (offset >= data.length - 1) {
warn(
"JpegImage.parse - reached the end of the image data " +
"without finding an EOI marker (0xFFD9)."