Merge pull request #5731 from Snuffleupagus/issue-5331

Skip fill bytes (0xFF) when decoding JPEG images (issue 5331)
2015-02-27 06:36:30 -06:00 · 2015-02-27 06:36:30 -06:00 · 2e14cc70cc
commit 2e14cc70cc
parent a0a94344d7 3651c9e1f7
1 changed files with 7 additions and 0 deletions
--- a/src/core/jpg.js
+++ b/src/core/jpg.js
@ -792,6 +792,13 @@ var JpegImage = (function jpegImage() {
              successiveApproximation >> 4, successiveApproximation & 15);
            offset += processed;
            break;
+
+          case 0xFFFF: // Fill bytes
+            if (data[offset] !== 0xFF) { // Avoid skipping a valid marker.
+              offset--;
+            }
+            break;
+
          default:
            if (data[offset - 3] === 0xFF &&
                data[offset - 2] >= 0xC0 && data[offset - 2] <= 0xFE) {