summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2016-11-15 14:46:16 +0100
committerMichael Niedermayer <[email protected]>2016-11-17 12:47:40 +0100
commit20d0f3201284f3df1d19ba99f5b58b398d86dd4a (patch)
tree1ec19578e2cf2945c31ba55fefd40ac422118eaa
parent07c5e65e6d6b2fbd1d01cb4f2fa9073eb1a26150 (diff)
avcodec/movtextdec: Fix potential integer overflow
Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 6ea27157682200e5f78cadcabdb009eccd9dd9b1) Signed-off-by: Michael Niedermayer <[email protected]>
-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++) {