diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 14:27:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 14:43:09 +0200 |
| commit | 84a6bc23570c17ce91071e41431103f709c0d595 (patch) | |
| tree | 3b7b9d48015644f48133efe3f2efd0716439e2be /libavcodec | |
| parent | 8bedbb82cee4463a43e60eb22674c8bf927280ef (diff) | |
jpeg2000: tag_tree_size: replace check by assert
This function is never called with values large enough for the
error condition to occur
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 62b6874a96..e1a0b96b73 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) |