walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #690 from rouault/failed_malloc_opj_dwt_encode_procedure 

[git/2.1 regression] Fix opj_write_tile() failure when numresolutions=1
This commit is contained in:
Mathieu Malaterre 2016-01-09 14:53:29 +01:00
parent 0dd44e7dba 6a1974d40d
commit cb33ff43bb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/openjp2/dwt.c
View File

@ -409,7 +409,9 @@ static INLINE OPJ_BOOL opj_dwt_encode_procedure(opj_tcd_tilecomp_t * tilec,void
l_data_size = opj_dwt_max_resolution( tilec->resolutions,tilec->numresolutions) * (OPJ_UINT32)sizeof(OPJ_INT32); l_data_size = opj_dwt_max_resolution( tilec->resolutions,tilec->numresolutions) * (OPJ_UINT32)sizeof(OPJ_INT32);
bj = (OPJ_INT32*)opj_malloc((size_t)l_data_size); bj = (OPJ_INT32*)opj_malloc((size_t)l_data_size);
if (! bj) { /* l_data_size is equal to 0 when numresolutions == 1 but bj is not used */
/* in that case, so do not error out */
if (l_data_size != 0 && ! bj) {
return OPJ_FALSE; return OPJ_FALSE;
} }
i = l; i = l;