summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorJUN FANG <jun_fang@foxitsoftware.com>2015-04-21 09:58:09 -0700
committerJUN FANG <jun_fang@foxitsoftware.com>2015-04-21 10:41:25 -0700
commit76b88e906a992b90609864867b620289a3e928e5 (patch)
tree58d193189d5ba4d1e10f1a8e448fde40a672b04a /core/src
parentced4c2bf1d0d1bab14a6145b35b3baecb175a691 (diff)
downloadpdfium-76b88e906a992b90609864867b620289a3e928e5.tar.xz
Merge to XFA: Fix a crashier due to images with abnormal size
BUG=453553 R=thestig@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/1093323003
Diffstat (limited to 'core/src')
-rw-r--r--core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c
index f944ad1afb..73dc5ab6fd 100644
--- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c
+++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c
@@ -8008,14 +8008,18 @@ OPJ_BOOL opj_j2k_update_image_data (opj_tcd_t * p_tcd, OPJ_BYTE * p_data, opj_im
l_img_comp_dest = p_output_image->comps;
for (i=0; i<l_image_src->numcomps; i++) {
-
/* Allocate output component buffer if necessary */
if (!l_img_comp_dest->data) {
-
- l_img_comp_dest->data = (OPJ_INT32*) opj_calloc(l_img_comp_dest->w * l_img_comp_dest->h, sizeof(OPJ_INT32));
- if (! l_img_comp_dest->data) {
- return OPJ_FALSE;
- }
+ OPJ_UINT32 width = l_img_comp_dest->w;
+ OPJ_UINT32 height = l_img_comp_dest->h;
+ const OPJ_UINT32 MAX_SIZE = UINT32_MAX / sizeof(OPJ_INT32);
+ if (height == 0 || width > MAX_SIZE / height) {
+ return OPJ_FALSE;
+ }
+ l_img_comp_dest->data = (OPJ_INT32*) opj_calloc(width * height, sizeof(OPJ_INT32));
+ if (!l_img_comp_dest->data) {
+ return OPJ_FALSE;
+ }
}
/* Copy info from decoded comp image to output image */