RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-25 08:10:41 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/rv40: Test remaining space in loop of get_dimension()

Browse Source 
Fixes infinite loop
Fixes: 178/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_RV40_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1546d487cf)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-11-15 22:50:35 +01:00
parent 7e8eb30f40
commit 0f8de7a3db
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/rv40.c
View File

@ -109,6 +109,8 @@ static int get_dimension(GetBitContext *gb, const int *dim)
val = dim[get_bits1(gb) - val]; val = dim[get_bits1(gb) - val];
if(!val){ if(!val){
do{ do{
if (get_bits_left(gb) < 8)
return AVERROR_INVALIDDATA;
t = get_bits(gb, 8); t = get_bits(gb, 8);
val += t << 2; val += t << 2;
}while(t == 0xFF); }while(t == 0xFF);