diff options
| author | gogil <gogil@stealien.com> | 2016-08-04 16:48:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-04 16:48:04 -0700 |
| commit | ff74356915d4c7f7c6eb16de1e9f403da4ecb6d5 (patch) | |
| tree | a73676ece147df315ef9699d4e10cd8cfe929b94 /third_party/libopenjpeg20/tcd.c | |
| parent | 1b4f6b36b3ed8d1f6cea96bc32c1b376f4a499bc (diff) | |
| download | pdfium-ff74356915d4c7f7c6eb16de1e9f403da4ecb6d5.tar.xz | |
openjpeg: Prevent integer overflows during calculation of |l_nb_code_blocks_size|
BUG=628890
R=ochang@chromium.org
Review-Url: https://codereview.chromium.org/2212973002
Diffstat (limited to 'third_party/libopenjpeg20/tcd.c')
| -rw-r--r-- | third_party/libopenjpeg20/tcd.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/third_party/libopenjpeg20/tcd.c b/third_party/libopenjpeg20/tcd.c index cd1c43921d..9270efe399 100644 --- a/third_party/libopenjpeg20/tcd.c +++ b/third_party/libopenjpeg20/tcd.c @@ -939,8 +939,15 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, l_current_precinct->cw = (OPJ_UINT32)((brcblkxend - tlcblkxstart) >> cblkwidthexpn); l_current_precinct->ch = (OPJ_UINT32)((brcblkyend - tlcblkystart) >> cblkheightexpn); + if (l_current_precinct->cw && ((OPJ_UINT32)-1) / l_current_precinct->cw < l_current_precinct->ch) { + return OPJ_FALSE; + } l_nb_code_blocks = l_current_precinct->cw * l_current_precinct->ch; /*fprintf(stderr, "\t\t\t\t precinct_cw = %d x recinct_ch = %d\n",l_current_precinct->cw, l_current_precinct->ch); */ + + if (((OPJ_UINT32)-1) / (OPJ_UINT32)sizeof_block < l_nb_code_blocks) { + return OPJ_FALSE; + } l_nb_code_blocks_size = l_nb_code_blocks * (OPJ_UINT32)sizeof_block; if (! l_current_precinct->cblks.blocks) { |