summarylogtreecommitdiffstats
path: root/jasper-avoid-assert-abort.diff
diff options
context:
space:
mode:
Diffstat (limited to 'jasper-avoid-assert-abort.diff')
-rw-r--r--jasper-avoid-assert-abort.diff14
1 files changed, 14 insertions, 0 deletions
diff --git a/jasper-avoid-assert-abort.diff b/jasper-avoid-assert-abort.diff
new file mode 100644
index 000000000000..d3622374c36d
--- /dev/null
+++ b/jasper-avoid-assert-abort.diff
@@ -0,0 +1,14 @@
+--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:30:54.193209780 +0100
++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:36:46.313217814 +0100
+@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in
+ case JP2_COLR_ICC:
+ iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
+ dec->colr->data.colr.iccplen);
+- assert(iccprof);
++ if (!iccprof) {
++ jas_eprintf("error: failed to parse ICC profile\n");
++ goto error;
++ }
+ jas_iccprof_gethdr(iccprof, &icchdr);
+ jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
+ jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));