Encoder: grow buffer size in opj_tcd_code_block_enc_allocate_data() t…

…o avoid write heap buffer overflow in opj_mqc_flush (fixes uclouvain#1283)
radiopaedia · Sep 21, 2021 · ca9f403 · ca9f403
1 parent fd29246
commit ca9f403
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
@@ -1243,9 +1243,11 @@ static OPJ_BOOL opj_tcd_code_block_enc_allocate_data(opj_tcd_cblk_enc_t *
 
     /* +1 is needed for https://github.com/uclouvain/openjpeg/issues/835 */
     /* and actually +2 required for https://github.com/uclouvain/openjpeg/issues/982 */
+    /* and +7 for https://github.com/uclouvain/openjpeg/issues/1283 (-M 3) */
+    /* and +26 for https://github.com/uclouvain/openjpeg/issues/1283 (-M 7) */
     /* TODO: is there a theoretical upper-bound for the compressed code */
     /* block size ? */
-    l_data_size = 2 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) *
+    l_data_size = 26 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) *
                                    (p_code_block->y1 - p_code_block->y0) * (OPJ_INT32)sizeof(OPJ_UINT32));
 
     if (l_data_size > p_code_block->data_size) {