|
 |
153bb5 |
From dc315cbd2d8582498c885a55ea73ecc84634168b Mon Sep 17 00:00:00 2001
|
|
|
153bb5 |
From: Even Rouault <even.rouault@spatialys.com>
|
|
|
153bb5 |
Date: Thu, 30 Jan 2020 00:59:57 +0100
|
|
|
153bb5 |
Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow
|
|
|
153bb5 |
|
|
|
153bb5 |
That could lead to later assertion failures.
|
|
|
153bb5 |
|
|
|
153bb5 |
Fixes #1231 / CVE-2020-8112
|
|
|
153bb5 |
---
|
|
|
153bb5 |
src/lib/openjp2/tcd.c | 20 ++++++++++++++++++--
|
|
|
153bb5 |
1 file changed, 18 insertions(+), 2 deletions(-)
|
|
|
153bb5 |
|
|
|
153bb5 |
diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
|
|
|
153bb5 |
index be3b843..647991c 100644
|
|
|
153bb5 |
--- a/src/lib/openjp2/tcd.c
|
|
|
153bb5 |
+++ b/src/lib/openjp2/tcd.c
|
|
|
153bb5 |
@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
|
|
|
153bb5 |
/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
|
|
|
153bb5 |
l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
|
|
|
153bb5 |
l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
|
|
|
153bb5 |
- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
|
|
|
153bb5 |
- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
|
|
|
153bb5 |
+ {
|
|
|
153bb5 |
+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
|
|
|
153bb5 |
+ (OPJ_INT32)l_pdx)) << l_pdx;
|
|
|
153bb5 |
+ if (tmp > (OPJ_UINT32)INT_MAX) {
|
|
|
153bb5 |
+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
|
|
|
153bb5 |
+ return OPJ_FALSE;
|
|
|
153bb5 |
+ }
|
|
|
153bb5 |
+ l_br_prc_x_end = (OPJ_INT32)tmp;
|
|
|
153bb5 |
+ }
|
|
|
153bb5 |
+ {
|
|
|
153bb5 |
+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
|
|
|
153bb5 |
+ (OPJ_INT32)l_pdy)) << l_pdy;
|
|
|
153bb5 |
+ if (tmp > (OPJ_UINT32)INT_MAX) {
|
|
|
153bb5 |
+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
|
|
|
153bb5 |
+ return OPJ_FALSE;
|
|
|
153bb5 |
+ }
|
|
|
153bb5 |
+ l_br_prc_y_end = (OPJ_INT32)tmp;
|
|
|
153bb5 |
+ }
|
|
|
153bb5 |
/*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 );*/
|
|
|
153bb5 |
|
|
|
153bb5 |
l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
|
|
|
153bb5 |
--
|
|
|
153bb5 |
2.21.1
|
|
|
153bb5 |
|