aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-11-15 14:46:16 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-12-04 20:25:15 +0100
commit083919e9c4595924cedb2f39db2f58f389794fd6 (patch)
tree95833c9c86c92522a151f61f36202c1fd6ba0beb /libavcodec
parentbc63205ae2eb3ecb16a61118c125e214daa3384b (diff)
downloadffmpeg-083919e9c4595924cedb2f39db2f58f389794fd6.tar.gz
avcodec/movtextdec: Fix potential integer overflow
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6ea27157682200e5f78cadcabdb009eccd9dd9b1) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/movtextdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index 28f7b8f5be..9c4195342f 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -491,7 +491,7 @@ static int mov_text_decode_frame(AVCodecContext *avctx,
m->size_var = 8;
//size_var is equal to 8 or 16 depending on the size of box
- if (m->tracksize + tsmb_size > avpkt->size)
+ if (tsmb_size > avpkt->size - m->tracksize)
break;
for (size_t i = 0; i < box_count; i++) {