diff options
| author | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-15 12:01:06 +0800 |
|---|---|---|
| committer | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-15 12:01:06 +0800 |
| commit | 7068d0aaf6234adb853518ef26dd602b39e70b3e (patch) | |
| tree | 3b0c5605fcb28e61a64f64e7080e1aa7e0c50db1 /third_party/libopenjpeg20/tcd.c | |
| parent | d4606455ef9be6f1e242c9fc72821a8c221d4a40 (diff) | |
| download | pdfium-7068d0aaf6234adb853518ef26dd602b39e70b3e.tar.xz | |
Merge to XFA: Fix a dividing zero bug in opj_tcd_init_tile()
BUG=541446
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1520203002 .
Review URL: https://codereview.chromium.org/1520323004 .
Diffstat (limited to 'third_party/libopenjpeg20/tcd.c')
| -rw-r--r-- | third_party/libopenjpeg20/tcd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/third_party/libopenjpeg20/tcd.c b/third_party/libopenjpeg20/tcd.c index 2fccff1c9c..aebe9be96c 100644 --- a/third_party/libopenjpeg20/tcd.c +++ b/third_party/libopenjpeg20/tcd.c @@ -727,7 +727,10 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, l_tilec->x1 = opj_int_ceildiv(l_tile->x1, (OPJ_INT32)l_image_comp->dx); l_tilec->y1 = opj_int_ceildiv(l_tile->y1, (OPJ_INT32)l_image_comp->dy); /*fprintf(stderr, "\tTile compo border = %d,%d,%d,%d\n", l_tilec->x0, l_tilec->y0,l_tilec->x1,l_tilec->y1);*/ - + if (l_tilec->x0 >= l_tilec->x1 || l_tilec->y0 >= l_tilec->y1) { + opj_event_msg(manager, EVT_ERROR, "Invalid tile data\n"); + return OPJ_FALSE; + } /* compute l_data_size with overflow check */ l_data_size = (OPJ_UINT32)(l_tilec->x1 - l_tilec->x0); if ((((OPJ_UINT32)-1) / l_data_size) < (OPJ_UINT32)(l_tilec->y1 - l_tilec->y0)) { |