third_party/libopenjpeg20/0001-image-data.patch - Issue 1416783002: Merge to M46: upgrade openjpeg to commit# cf352af

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/libopenjpeg20/0001-image-data.patch

Issue 1416783002: Merge to M46: upgrade openjpeg to commit# cf352af (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@2490

Patch Set: Fix pdfium:168 since we are already half way there Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
(Empty)
	1 diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c

	2 index e612d06..d515798 100644

	3 --- a/third_party/libopenjpeg20/j2k.c

	4 +++ b/third_party/libopenjpeg20/j2k.c

	5 @@ -8148,11 +8148,16 @@ static OPJ_BOOL opj_j2k_update_image_data (opj_tcd_t * p _tcd, OPJ_BYTE * p_data,

	6

	7 /* Allocate output component buffer if necessary */

	8 if (!l_img_comp_dest->data) {

	9 -

	10 - l_img_comp_dest->data = (OPJ_INT32) opj_calloc((OPJ_SI ZE_T)l_img_comp_dest->w (OPJ_SIZE_T)l_img_comp_dest->h, sizeof(OPJ_INT32));

	11 - if (! l_img_comp_dest->data) {

	12 - return OPJ_FALSE;

	13 - }

	14 + OPJ_UINT32 width = l_img_comp_dest->w;

	15 + OPJ_UINT32 height = l_img_comp_dest->h;

	16 + const OPJ_UINT32 MAX_SIZE = UINT32_MAX / sizeof(OPJ_INT32);

	17 + if (height == 0 \|\| width > MAX_SIZE / height) {

	18 + return OPJ_FALSE;

	19 + }

	20 + l_img_comp_dest->data = (OPJ_INT32)opj_calloc(width heig ht, sizeof(OPJ_INT32));

	21 + if (!l_img_comp_dest->data) {

	22 + return OPJ_FALSE;

	23 + }

	24 }

	25

	26 /* Copy info from decoded comp image to output image */

OLD	NEW