File jasper-CVE-2018-20570.patch of Package jasper.33540
Index: jasper-1.900.14/src/libjasper/jp2/jp2_enc.c
===================================================================
--- jasper-1.900.14.orig/src/libjasper/jp2/jp2_enc.c
+++ jasper-1.900.14/src/libjasper/jp2/jp2_enc.c
@@ -272,7 +272,8 @@ int sgnd;
needcdef = 1;
switch (jas_clrspc_fam(jas_image_clrspc(image))) {
case JAS_CLRSPC_FAM_RGB:
- if (jas_image_cmpttype(image, 0) ==
+ if (jas_image_numcmpts(image) >= 3 &&
+ jas_image_cmpttype(image, 0) ==
JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R) &&
jas_image_cmpttype(image, 1) ==
JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G) &&
@@ -281,7 +282,8 @@ int sgnd;
needcdef = 0;
break;
case JAS_CLRSPC_FAM_YCBCR:
- if (jas_image_cmpttype(image, 0) ==
+ if (jas_image_numcmpts(image) >= 3 &&
+ jas_image_cmpttype(image, 0) ==
JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_Y) &&
jas_image_cmpttype(image, 1) ==
JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_CB) &&
@@ -290,7 +292,8 @@ int sgnd;
needcdef = 0;
break;
case JAS_CLRSPC_FAM_GRAY:
- if (jas_image_cmpttype(image, 0) ==
+ if (jas_image_numcmpts(image) >= 1 &&
+ jas_image_cmpttype(image, 0) ==
JAS_IMAGE_CT_COLOR(JAS_IMAGE_CT_GRAY_Y))
needcdef = 0;
break;