diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-03-29 10:40:58 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-03-29 10:40:58 +0100 |
| commit | e1740e7ce79d0a1676db4da0f4189b64e85f52cb (patch) | |
| tree | 9cc2d66bbfc98b3fd2c4fc0826d76f1c85238ab5 /src/lib | |
| parent | 51f097e6d5754ddae93e716276fe8176b44ec548 (diff) | |
Revert "[MJ2] Avoid index out of bounds access to pi->include[]"
This reverts commit c277159986c80142180fbe5efb256bbf3bdf3edc.
The commit didn't compile. include_size is not defined in openmj2
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openmj2/pi.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/lib/openmj2/pi.c b/src/lib/openmj2/pi.c index f74dc6af..ce9c16e4 100644 --- a/src/lib/openmj2/pi.c +++ b/src/lib/openmj2/pi.c @@ -85,12 +85,6 @@ static opj_bool pi_next_cprl(opj_pi_iterator_t * pi); ========================================================== */ -static void opj_pi_emit_error(opj_pi_iterator_t * pi, const char* msg) -{ - (void)pi; - (void)msg; -} - static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi) { opj_pi_comp_t *comp = NULL; @@ -120,11 +114,6 @@ static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi) for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) { index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p; - /* Avoids index out of bounds access with include*/ - if (index >= pi->include_size) { - opj_pi_emit_error(pi, "Invalid access to pi->include"); - return OPJ_FALSE; - } if (!pi->include[index]) { pi->include[index] = 1; return OPJ_TRUE; @@ -167,11 +156,6 @@ static opj_bool pi_next_rlcp(opj_pi_iterator_t * pi) for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) { index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p; - /* Avoids index out of bounds access with include*/ - if (index >= pi->include_size) { - opj_pi_emit_error(pi, "Invalid access to pi->include"); - return OPJ_FALSE; - } if (!pi->include[index]) { pi->include[index] = 1; return OPJ_TRUE; @@ -272,11 +256,6 @@ static opj_bool pi_next_rpcl(opj_pi_iterator_t * pi) for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) { index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p; - /* Avoids index out of bounds access with include*/ - if (index >= pi->include_size) { - opj_pi_emit_error(pi, "Invalid access to pi->include"); - return OPJ_FALSE; - } if (!pi->include[index]) { pi->include[index] = 1; return OPJ_TRUE; @@ -377,11 +356,6 @@ static opj_bool pi_next_pcrl(opj_pi_iterator_t * pi) for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) { index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p; - /* Avoids index out of bounds access with include*/ - if (index >= pi->include_size) { - opj_pi_emit_error(pi, "Invalid access to pi->include"); - return OPJ_FALSE; - } if (!pi->include[index]) { pi->include[index] = 1; return OPJ_TRUE; @@ -480,11 +454,6 @@ static opj_bool pi_next_cprl(opj_pi_iterator_t * pi) for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) { index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p; - /* Avoids index out of bounds access with include*/ - if (index >= pi->include_size) { - opj_pi_emit_error(pi, "Invalid access to pi->include"); - return OPJ_FALSE; - } if (!pi->include[index]) { pi->include[index] = 1; return OPJ_TRUE; |