12345678910111213141516171819202122232425262728293031323334353637383940414243444546 |
- From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001
- From: Even Rouault <even.rouault@spatialys.com>
- Date: Thu, 30 Jan 2020 00:59:57 +0100
- Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow
- That could lead to later assertion failures.
- Fixes #1231 / CVE-2020-8112
- [Retrieved from:
- https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074]
- Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- ---
- src/lib/openjp2/tcd.c | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
- diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
- index deecc4dff..aa419030a 100644
- --- a/src/lib/openjp2/tcd.c
- +++ b/src/lib/openjp2/tcd.c
- @@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
- /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
- l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
- l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
- - l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
- - l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
- + {
- + OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
- + (OPJ_INT32)l_pdx)) << l_pdx;
- + if (tmp > (OPJ_UINT32)INT_MAX) {
- + opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
- + return OPJ_FALSE;
- + }
- + l_br_prc_x_end = (OPJ_INT32)tmp;
- + }
- + {
- + OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
- + (OPJ_INT32)l_pdy)) << l_pdy;
- + if (tmp > (OPJ_UINT32)INT_MAX) {
- + opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
- + return OPJ_FALSE;
- + }
- + l_br_prc_y_end = (OPJ_INT32)tmp;
- + }
- /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/
-
- l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
|