From: Even Rouault Date: Wed, 26 Jul 2017 18:13:09 +0000 (+0200) Subject: opj_decompress: fix null pointer dereference on comps[].data on id_000167,sig_11... X-Git-Tag: v2.2.0~56 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94cc97c58acfa574e734fac5eb673c516c0ac469;p=openjpeg opj_decompress: fix null pointer dereference on comps[].data on id_000167,sig_11,src_006079,op_havoc,rep_4 (#939) --- 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++;