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

avcodec/wavpack: Check value before shift in wp_exp2() 

Fixes undefined shift, all callers should be changed to check the value
they use with wp_exp2() or its return value.

Fixes: 692/clusterfuzz-testcase-5757381516460032

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-02-28 22:07:38 +01:00
parent 12c3e120fe
commit f8060ab927
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/wavpack.h
View File

@ -171,6 +171,8 @@ static av_always_inline int wp_exp2(int16_t val)
res = wp_exp2_table[val & 0xFF] | 0x100; res = wp_exp2_table[val & 0xFF] | 0x100;
val >>= 8; val >>= 8;
if (val > 31)
return INT_MIN;
res = (val > 9) ? (res << (val - 9)) : (res >> (9 - val)); res = (val > 9) ? (res << (val - 9)) : (res >> (9 - val));
return neg ? -res : res; return neg ? -res : res;
} }