34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From fbd30b064f8f9607d500437b6fedc41431fd6cdc Mon Sep 17 00:00:00 2001
|
|
From: Even Rouault <even.rouault@spatialys.com>
|
|
Date: Tue, 1 Dec 2020 19:51:35 +0100
|
|
Subject: [PATCH] opj_t2_encode_packet(): avoid out of bound access of #1294,
|
|
but likely not the proper fix
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/uclouvain/openjpeg/commit/fbd30b064f8f9607d500437b6fedc41431fd6cdc
|
|
|
|
---
|
|
src/lib/openjp2/t2.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c
|
|
index 71472b499..e452edd19 100644
|
|
--- a/src/lib/openjp2/t2.c
|
|
+++ b/src/lib/openjp2/t2.c
|
|
@@ -739,6 +739,15 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno,
|
|
continue;
|
|
}
|
|
|
|
+ /* Avoid out of bounds access of https://github.com/uclouvain/openjpeg/issues/1294 */
|
|
+ /* but likely not a proper fix. */
|
|
+ if (precno >= res->pw * res->ph) {
|
|
+ opj_event_msg(p_manager, EVT_ERROR,
|
|
+ "opj_t2_encode_packet(): accessing precno=%u >= %u\n",
|
|
+ precno, res->pw * res->ph);
|
|
+ return OPJ_FALSE;
|
|
+ }
|
|
+
|
|
prc = &band->precincts[precno];
|
|
opj_tgt_reset(prc->incltree);
|
|
opj_tgt_reset(prc->imsbtree);
|