Commit 0afdfbe1 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent d64b6c38
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
/* tag tree routines */ /* tag tree routines */
/* allocate the memory for tag tree */ /* 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) { while (w > 1 || h > 1) {
res += w * h; res += w * (int64_t)h;
av_assert0(res + 1 < INT32_MAX); av_assert0(res + 1 < INT32_MAX);
w = (w + 1) >> 1; w = (w + 1) >> 1;
h = (h + 1) >> 1; h = (h + 1) >> 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment