about summary refs log tree commit diff
path: root/converter/other
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2019-08-29 20:21:46 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2019-08-29 20:21:46 +0000
commite0b11f08d17c8f5a91126a62488e6b84aff4e53f (patch)
tree0331576fb3c092e3eba5bd281d3c2efa1cd49f4d /converter/other
parent666a5ae52c0b7736cdf1753183052e0897f857b3 (diff)
downloadnetpbm-mirror-e0b11f08d17c8f5a91126a62488e6b84aff4e53f.tar.gz
netpbm-mirror-e0b11f08d17c8f5a91126a62488e6b84aff4e53f.tar.xz
netpbm-mirror-e0b11f08d17c8f5a91126a62488e6b84aff4e53f.zip
fix null pointer dereference
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3666 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other')
-rw-r--r--converter/other/jpeg2000/libjasper/jp2/jp2_dec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/converter/other/jpeg2000/libjasper/jp2/jp2_dec.c b/converter/other/jpeg2000/libjasper/jp2/jp2_dec.c
index a9463a57..4036f0f2 100644
--- a/converter/other/jpeg2000/libjasper/jp2/jp2_dec.c
+++ b/converter/other/jpeg2000/libjasper/jp2/jp2_dec.c
@@ -563,6 +563,9 @@ jp2_decode(jas_stream_t *in, char *optstr) {
                                   channo + 1));
                 }
 #endif
+            } else {
+                jas_eprintf("error: invalid MTYP in CMAP box\n");
+                goto error;
             }
         }
     }