diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-15 22:50:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-26 15:12:27 +0100 |
| commit | 698528207ab8016cd891bc5aa8c254f7f0d573dc (patch) | |
| tree | da63a2e9fd59ecb76880a66df8c5e6dddfbdac2e | |
| parent | 1e86f1a64690eeb132c56815917ea66ce90546cc (diff) | |
| download | ffmpeg-698528207ab8016cd891bc5aa8c254f7f0d573dc.tar.gz | |
avcodec/rv40: Test remaining space in loop of get_dimension()
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 1546d487cf12da37d90a080813f8d57ac33036bf)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/rv40.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 3ff1554d3c..c52e06d4c9 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -109,6 +109,8 @@ static int get_dimension(GetBitContext *gb, const int *dim) val = dim[get_bits1(gb) - val]; if(!val){ do{ + if (get_bits_left(gb) < 8) + return AVERROR_INVALIDDATA; t = get_bits(gb, 8); val += t << 2; }while(t == 0xFF); |