Merge pull request #1080 from setharnold/patch-1

fix unchecked integer multiplication overflow
This commit is contained in:
Even Rouault 2018-02-25 18:21:23 +01:00 committed by GitHub
commit 90b1bffa7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -48,8 +48,8 @@ opj_image_t* OPJ_CALLCONV opj_image_create(OPJ_UINT32 numcmpts,
image->color_space = clrspc; image->color_space = clrspc;
image->numcomps = numcmpts; image->numcomps = numcmpts;
/* allocate memory for the per-component information */ /* allocate memory for the per-component information */
image->comps = (opj_image_comp_t*)opj_calloc(1, image->comps = (opj_image_comp_t*)opj_calloc(image->numcomps,
image->numcomps * sizeof(opj_image_comp_t)); sizeof(opj_image_comp_t));
if (!image->comps) { if (!image->comps) {
/* TODO replace with event manager, breaks API */ /* TODO replace with event manager, breaks API */
/* fprintf(stderr,"Unable to allocate memory for image.\n"); */ /* fprintf(stderr,"Unable to allocate memory for image.\n"); */