highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cavsdec: avoid possible crash with crafted input

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9f06c1c61e)
This commit is contained in:
Michael Niedermayer
2011-08-10 17:29:51 +02:00
parent 8af11e51f2
commit b6187e48db
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/cavsdec.c
View File

@@ -166,7 +166,7 @@ static inline int decode_residual_inter(AVSContext *h) {
/* get coded block pattern */ /* get coded block pattern */
int cbp= get_ue_golomb(&h->s.gb); int cbp= get_ue_golomb(&h->s.gb);
if(cbp > 63){ if(cbp > 63U){
av_log(h->s.avctx, AV_LOG_ERROR, "illegal inter cbp\n"); av_log(h->s.avctx, AV_LOG_ERROR, "illegal inter cbp\n");
return -1; return -1;
} }
@@ -226,7 +226,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code) {
/* get coded block pattern */ /* get coded block pattern */
if(h->pic_type == AV_PICTURE_TYPE_I) if(h->pic_type == AV_PICTURE_TYPE_I)
cbp_code = get_ue_golomb(gb); cbp_code = get_ue_golomb(gb);
if(cbp_code > 63){ if(cbp_code > 63U){
av_log(h->s.avctx, AV_LOG_ERROR, "illegal intra cbp\n"); av_log(h->s.avctx, AV_LOG_ERROR, "illegal intra cbp\n");
return -1; return -1;
} }