Fix CVE-2018-19542: Check for NULL pointer in jp2_decode

Patch by Timothy Lyanguzov <[email protected]> originally proposed at jasper-software/jasper#200. To fix jasper-software/jasper#182. Instead of jasper-software/jasper#197 / https://gist.github.com/apoleon/701d7db34d63faa16463935b1465c74e. Fix #7
jasper-maint · Jun 19, 2020 · ade4b48 · ade4b48
1 parent 9aef6d9
commit ade4b48
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/libjasper/jp2/jp2_dec.c b/src/libjasper/jp2/jp2_dec.c
@@ -388,6 +388,9 @@ jas_image_t *jp2_decode(jas_stream_t *in, const char *optstr)
 				jas_image_setcmpttype(dec->image, newcmptno, jp2_getct(jas_image_clrspc(dec->image), 0, channo + 1));
 				}
 #endif
+			} else {
+				jas_eprintf("error: invalid MTYP in CMAP box\n");
+				goto error;
 			}
 		}
 	}