From 94cc97c58acfa574e734fac5eb673c516c0ac469 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 26 Jul 2017 20:13:09 +0200
Subject: [PATCH] opj_decompress: fix null pointer dereference on comps[].data
 on id_000167,sig_11,src_006079,op_havoc,rep_4 (#939)

---
 src/bin/jp2/opj_decompress.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c
index 3dc651dd..aa21c66d 100644
--- a/src/bin/jp2/opj_decompress.c
+++ b/src/bin/jp2/opj_decompress.c
@@ -1489,6 +1489,17 @@ int main(int argc, char **argv)
             }
         }
 
+        /* FIXME? Shouldn't that situation be considered as an error of */
+        /* opj_decode() / opj_get_decoded_tile() ? */
+        if (image->comps[0].data == NULL) {
+            fprintf(stderr, "ERROR -> opj_decompress: no image data!\n");
+            opj_destroy_codec(l_codec);
+            opj_stream_destroy(l_stream);
+            opj_image_destroy(image);
+            failed = 1;
+            goto fin;
+        }
+
         tCumulative += opj_clock() - t;
         numDecompressedImages++;