Merge pull request #5426 from fkaelberer/fixJpxOutOfPackets

Fix JPX "Out of Packets" Error (issues 4358, 4659, 4814)
mozilla · Oct 22, 2014 · 04390d8 · 04390d8
2 parents 9e7966a + 6337a43
commit 04390d8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/core/jpx.js b/src/core/jpx.js
@@ -540,6 +540,11 @@ var JpxImage = (function JpxImageClosure() {
         codeblock.precinctNumber = precinctNumber;
         codeblock.subbandType = subband.type;
         codeblock.Lblock = 3;
+
+        if (codeblock.tbx1_ <= codeblock.tbx0_ ||
+            codeblock.tby1_ <= codeblock.tby0_) {
+          continue;
+        }
         codeblocks.push(codeblock);
         // building precinct for the sub-band
         var precinct = precincts[precinctNumber];

diff --git a/test/pdfs/bug865858.pdf.link b/test/pdfs/bug865858.pdf.link
@@ -0,0 +1 @@
+https://bug865858.bugzilla.mozilla.org/attachment.cgi?id=742273
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -1690,6 +1690,14 @@
       "type": "eq",
       "about": "JPX with 0xFF55 marker"
     },
+    {  "id": "bug865858",
+      "file": "pdfs/bug865858.pdf",
+      "md5": "7a81bd987dc1d95e9a0be46b7c3f2e18",
+      "link": true,
+      "rounds": 1,
+      "type": "eq",
+      "about": "JPX packets"
+    },
     {  "id": "bug766138",
       "file": "pdfs/bug766138.pdf",
       "md5": "b171f5cf8d9834348112fba60ee54f8c",