Skip to content

Commit 397f62c

Browse files
committed
Fix write heap buffer overflow in opj_mqc_byteout(). Discovered by Ke Liu of Tencent's Xuanwu LAB (#835)
1 parent 11445ed commit 397f62c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Diff for: src/lib/openjp2/tcd.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1182,8 +1182,9 @@ static OPJ_BOOL opj_tcd_code_block_enc_allocate_data(opj_tcd_cblk_enc_t *
11821182
{
11831183
OPJ_UINT32 l_data_size;
11841184

1185-
l_data_size = (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) *
1186-
(p_code_block->y1 - p_code_block->y0) * (OPJ_INT32)sizeof(OPJ_UINT32));
1185+
/* The +1 is needed for https://github.com/uclouvain/openjpeg/issues/835 */
1186+
l_data_size = 1 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) *
1187+
(p_code_block->y1 - p_code_block->y0) * (OPJ_INT32)sizeof(OPJ_UINT32));
11871188

11881189
if (l_data_size > p_code_block->data_size) {
11891190
if (p_code_block->data) {

0 commit comments

Comments
 (0)