diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-08-14 17:20:37 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-08-14 17:20:37 +0200 |
| commit | afb308b9ccbe129608c9205cf3bb39bbefad90b9 (patch) | |
| tree | d325052de9fd9a393f87970a76ecb6d95b3d57fb /src | |
| parent | 0b4c3ce75d11600ebc6675bd871f78ca3c95bc60 (diff) | |
Encoder: grow buffer size in opj_tcd_code_block_enc_allocate_data() to avoid write heap buffer overflow in opj_mqc_flush (#982)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp2/tcd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c index 301c7213..53cdcf64 100644 --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -1187,8 +1187,11 @@ static OPJ_BOOL opj_tcd_code_block_enc_allocate_data(opj_tcd_cblk_enc_t * { OPJ_UINT32 l_data_size; - /* The +1 is needed for https://github.com/uclouvain/openjpeg/issues/835 */ - l_data_size = 1 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) * + /* +1 is needed for https://github.com/uclouvain/openjpeg/issues/835 */ + /* and actually +2 required for https://github.com/uclouvain/openjpeg/issues/982 */ + /* 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) * (p_code_block->y1 - p_code_block->y0) * (OPJ_INT32)sizeof(OPJ_UINT32)); if (l_data_size > p_code_block->data_size) { |