aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-08-10 17:29:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-07 15:11:55 +0200
commit958f0a0f19c76267e662192707b3bddd67f15770 (patch)
tree099c4842a222ba8fb6d6354a5c0a91b3b4695490
parentf601bf4004ae1e13bbd805a98f95822a3def4c38 (diff)
downloadffmpeg-958f0a0f19c76267e662192707b3bddd67f15770.tar.gz
cavsdec: avoid possible crash with crafted input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9f06c1c61e876e930753da200bfe835817e30a53)
-rw-r--r--libavcodec/cavsdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index 6f4c83b850..5671c25444 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -163,7 +163,7 @@ static inline int decode_residual_inter(AVSContext *h) {
/* get coded block pattern */
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");
return -1;
}
@@ -222,7 +222,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code) {
/* get coded block pattern */
if(h->pic_type == AV_PICTURE_TYPE_I)
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");
return -1;
}