avcodec/jpeg2000: fix type of arguments of tag_tree_size

Fixes: out of array read Fixes: 36b8096fefab16c4c9326a508053e95c/signal_sigsegv_1d9ce18_3233_1a55196b018106dfabeace071a432d9e.r3d Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago · 0afdfbe116
parent d64b6c3819
commit 0afdfbe116
1 changed files with 3 additions and 3 deletions
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@ -38,11 +38,11 @@
 /* tag tree routines */

 /* allocate the memory for tag tree */
-static int32_t tag_tree_size(uint16_t w, uint16_t h)
+static int32_t tag_tree_size(int w, int h)
 {
-    uint32_t res = 0;
+    int64_t res = 0;
    while (w > 1 || h > 1) {
-        res += w * h;
+        res += w * (int64_t)h;
        av_assert0(res + 1 < INT32_MAX);
        w = (w + 1) >> 1;
        h = (h + 1) >> 1;