76da579431
Fixes a NULL Pointer Dereference jp2_encode: https://github.com/mdadams/jasper/issues/120 No CVE assigned yet. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
31 lines
942 B
Diff
31 lines
942 B
Diff
From 58ba0365d911b9f9dd68e9abf826682c0b4f2293 Mon Sep 17 00:00:00 2001
|
|
From: Michael Adams <mdadams@ece.uvic.ca>
|
|
Date: Mon, 6 Mar 2017 08:06:54 -0800
|
|
Subject: [PATCH] Added a check in the JP2 encoder to ensure that the image to
|
|
be coded has at least one component.
|
|
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
---
|
|
src/libjasper/jp2/jp2_enc.c | 5 +++++
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/src/libjasper/jp2/jp2_enc.c b/src/libjasper/jp2/jp2_enc.c
|
|
index 9a5e106..af4d9a4 100644
|
|
--- a/src/libjasper/jp2/jp2_enc.c
|
|
+++ b/src/libjasper/jp2/jp2_enc.c
|
|
@@ -115,6 +115,11 @@ int jp2_encode(jas_image_t *image, jas_stream_t *out, const char *optstr)
|
|
iccstream = 0;
|
|
iccprof = 0;
|
|
|
|
+ if (jas_image_numcmpts(image) < 1) {
|
|
+ jas_eprintf("image must have at least one component\n");
|
|
+ goto error;
|
|
+ }
|
|
+
|
|
allcmptssame = 1;
|
|
sgnd = jas_image_cmptsgnd(image, 0);
|
|
prec = jas_image_cmptprec(image, 0);
|
|
--
|
|
2.11.0
|
|
|