aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dirac_arith.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-28 02:14:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-10-28 02:15:40 +0100
commit39680caceebfc6abf09b17032048752c014e57a8 (patch)
treea4bae6cbf095958cc8385611009dc94acd59d845 /libavcodec/dirac_arith.h
parent5145d22b88b9835db81c4d286b931a78e08ab76a (diff)
downloadffmpeg-39680caceebfc6abf09b17032048752c014e57a8.tar.gz
avcodec/dirac_arith: fix integer overflow
Fixes: asan_heap-oob_1078676_9_008.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dirac_arith.h')
-rw-r--r--libavcodec/dirac_arith.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/dirac_arith.h b/libavcodec/dirac_arith.h
index 089c71a698..a1fa96b5bc 100644
--- a/libavcodec/dirac_arith.h
+++ b/libavcodec/dirac_arith.h
@@ -171,6 +171,10 @@ static inline int dirac_get_arith_uint(DiracArith *c, int follow_ctx, int data_c
{
int ret = 1;
while (!dirac_get_arith_bit(c, follow_ctx)) {
+ if (ret >= 0x40000000) {
+ av_log(NULL, AV_LOG_ERROR, "dirac_get_arith_uint overflow\n");
+ return -1;
+ }
ret <<= 1;
ret += dirac_get_arith_bit(c, data_ctx);
follow_ctx = ff_dirac_next_ctx[follow_ctx];