File openjpeg-CVE-2020-27845.patch of Package openjpeg.26661
Index: openjpeg-1.5.2/libopenjpeg/pi.c
===================================================================
--- openjpeg-1.5.2.orig/libopenjpeg/pi.c
+++ openjpeg-1.5.2/libopenjpeg/pi.c
@@ -84,6 +84,11 @@ static opj_bool pi_next_lrcp(opj_pi_iter
opj_pi_resolution_t *res = NULL;
long index = 0;
+ if (pi->poc.compno0 >= pi->numcomps ||
+ pi->poc.compno1 >= pi->numcomps + 1) {
+ return OPJ_FALSE;
+ }
+
if (!pi->first) {
comp = &pi->comps[pi->compno];
res = &comp->resolutions[pi->resno];
@@ -127,6 +132,11 @@ static opj_bool pi_next_rlcp(opj_pi_iter
opj_pi_resolution_t *res = NULL;
long index = 0;
+ if (pi->poc.compno0 >= pi->numcomps ||
+ pi->poc.compno1 >= pi->numcomps + 1) {
+ return OPJ_FALSE;
+ }
+
if (!pi->first) {
comp = &pi->comps[pi->compno];
res = &comp->resolutions[pi->resno];
@@ -169,6 +179,11 @@ static opj_bool pi_next_rpcl(opj_pi_iter
opj_pi_resolution_t *res = NULL;
long index = 0;
+ if (pi->poc.compno0 >= pi->numcomps ||
+ pi->poc.compno1 >= pi->numcomps + 1) {
+ return OPJ_FALSE;
+ }
+
if (!pi->first) {
goto LABEL_SKIP;
} else {
@@ -262,6 +277,11 @@ static opj_bool pi_next_pcrl(opj_pi_iter
opj_pi_resolution_t *res = NULL;
long index = 0;
+ if (pi->poc.compno0 >= pi->numcomps ||
+ pi->poc.compno1 >= pi->numcomps + 1) {
+ return OPJ_FALSE;
+ }
+
if (!pi->first) {
comp = &pi->comps[pi->compno];
goto LABEL_SKIP;
@@ -353,6 +373,11 @@ static opj_bool pi_next_cprl(opj_pi_iter
opj_pi_resolution_t *res = NULL;
long index = 0;
+ if (pi->poc.compno0 >= pi->numcomps ||
+ pi->poc.compno1 >= pi->numcomps + 1) {
+ return OPJ_FALSE;
+ }
+
if (!pi->first) {
comp = &pi->comps[pi->compno];
goto LABEL_SKIP;