RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2015-12-03 01:08:53 +01:00
parent d64b6c3819
commit 0afdfbe116
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/jpeg2000.c
View File

@ -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;