aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-11-15 14:46:16 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-12-05 18:29:12 +0100
commit04310c11aa3967156ef1db9f142e459109b734d6 (patch)
treeb5eafa43a4ceb95b19f23c3d915a01bb006570e1
parenteaf2f750c35677f16097ceb45a69a6051ac72853 (diff)
downloadffmpeg-04310c11aa3967156ef1db9f142e459109b734d6.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>
-rw-r--r--libavcodec/movtextdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index a33fff7518..923e58299b 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -485,7 +485,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++) {