eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/rangecoder: Check e

Browse Source 
Fixes hang.nut

Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b2955b6c5a)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-09-25 14:26:14 +02:00
parent abd20c2057
commit 50f62fef19
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/ffv1dec.c
View File

@@ -47,8 +47,11 @@ static inline av_flatten int get_symbol_inline(RangeCoder *c, uint8_t *state,
else { else {
int i, e, a; int i, e, a;
e = 0; e = 0;
while (get_rac(c, state + 1 + FFMIN(e, 9))) // 1..10 while (get_rac(c, state + 1 + FFMIN(e, 9))) { // 1..10
e++; e++;
if (e > 31)
return AVERROR_INVALIDDATA;
}
a = 1; a = 1;
for (i = e - 1; i >= 0; i--) for (i = e - 1; i >= 0; i--)

2
libavcodec/snow.h
View File

@@ -563,6 +563,8 @@ static inline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
e= 0; e= 0;
while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10 while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10
e++; e++;
if (e > 31)
return AVERROR_INVALIDDATA;
} }
a= 1; a= 1;