har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jpeg2000: tag_tree_size: replace check by assert

Browse Source 
This function is never called with values large enough for the
error condition to occur

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-30 14:27:03 +02:00
parent 8bedbb82ce
commit 84a6bc2357
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/jpeg2000.c
View File

@ -25,6 +25,7 @@
* JPEG 2000 image encoder and decoder common functions * JPEG 2000 image encoder and decoder common functions
*/ */
#include "libavutil/avassert.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "avcodec.h" #include "avcodec.h"
@ -40,8 +41,7 @@ static int32_t tag_tree_size(uint16_t w, uint16_t h)
uint32_t res = 0; uint32_t res = 0;
while (w > 1 || h > 1) { while (w > 1 || h > 1) {
res += w * h; res += w * h;
if (res + 1 >= INT32_MAX) av_assert0(res + 1 < INT32_MAX);
return -1;
w = (w + 1) >> 1; w = (w + 1) >> 1;
h = (h + 1) >> 1; h = (h + 1) >> 1;
} }
@ -55,8 +55,6 @@ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h)
int32_t tt_size; int32_t tt_size;
tt_size = tag_tree_size(w, h); tt_size = tag_tree_size(w, h);
if (tt_size == -1)
return NULL;
t = res = av_mallocz_array(tt_size, sizeof(*t)); t = res = av_mallocz_array(tt_size, sizeof(*t));
if (!res) if (!res)