From: Michael Niedermayer <[email protected]> This function is never called with values large enough for the error condition to occur
Signed-off-by: Michael Niedermayer <[email protected]> --- libavcodec/jpeg2000.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 460732a..ad5e736 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -25,6 +25,7 @@ * JPEG 2000 image encoder and decoder common functions */ +#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/mem.h" #include "avcodec.h" @@ -40,8 +41,7 @@ static int32_t tag_tree_size(uint16_t w, uint16_t h) uint32_t res = 0; while (w > 1 || h > 1) { res += w * h; - if (res + 1 >= INT32_MAX) - return -1; + av_assert0(res + 1 < INT32_MAX); w = (w + 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; tt_size = tag_tree_size(w, h); - if (tt_size == -1) - return NULL; t = res = av_mallocz_array(tt_size, sizeof(*t)); if (!res) -- 1.8.2.1 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
