mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
avcodec/msmpeg4dec: Check for cbpy VLC errors
Fixes: runtime error: left shift of negative value -1
Fixes: 1480/clusterfuzz-testcase-minimized-5188321007370240
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 15e892aad1
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
5d0e4c877f
commit
971fe06074
@ -169,12 +169,23 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t block[6][64])
|
||||
s->mv[0][0][1] = my;
|
||||
*mb_type_ptr = MB_TYPE_L0 | MB_TYPE_16x16;
|
||||
} else {
|
||||
int v;
|
||||
if(s->msmpeg4_version==2){
|
||||
s->ac_pred = get_bits1(&s->gb);
|
||||
cbp|= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors
|
||||
v = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
|
||||
if (v < 0) {
|
||||
av_log(s->avctx, AV_LOG_ERROR, "cbpy vlc invalid\n");
|
||||
return -1;
|
||||
}
|
||||
cbp|= v<<2;
|
||||
} else{
|
||||
s->ac_pred = 0;
|
||||
cbp|= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors
|
||||
v = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
|
||||
if (v < 0) {
|
||||
av_log(s->avctx, AV_LOG_ERROR, "cbpy vlc invalid\n");
|
||||
return -1;
|
||||
}
|
||||
cbp|= v<<2;
|
||||
if(s->pict_type==AV_PICTURE_TYPE_P) cbp^=0x3C;
|
||||
}
|
||||
*mb_type_ptr = MB_TYPE_INTRA;
|
||||
|
Loading…
Reference in New Issue
Block a user