Module: libav Branch: master Commit: 39185ec4faa9ef33954dbf2394444e045b632673
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Sun Oct 13 03:30:06 2013 +0200 cavs: Check for negative cbp Sample-Id: 00000647-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] --- libavcodec/cavsdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 37eb118..142b844 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -602,8 +602,8 @@ static inline int decode_residual_inter(AVSContext *h) /* get coded block pattern */ int cbp = get_ue_golomb(&h->gb); - if (cbp > 63) { - av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp\n"); + if (cbp > 63 || cbp < 0) { + av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp %d\n", cbp); return AVERROR_INVALIDDATA; } h->cbp = cbp_tab[cbp][1]; @@ -673,7 +673,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code) /* get coded block pattern */ if (h->cur.f->pict_type == AV_PICTURE_TYPE_I) cbp_code = get_ue_golomb(gb); - if (cbp_code > 63) { + if (cbp_code > 63 || cbp_code < 0) { av_log(h->avctx, AV_LOG_ERROR, "illegal intra cbp\n"); return AVERROR_INVALIDDATA; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
