summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorSasi Inguva <isasi-at-google.com@ffmpeg.org>2016-09-27 19:23:20 -0700
committerPhilip Langdale <philipl@overt.org>2016-09-27 19:49:02 -0700
commit7e9e1b7070242a79fa6e3acd749d7fe76e39ea7b (patch)
treed6879c7c3589c4b9152ebb4d101e7a881a25a347 /libavcodec
parent92de2c23a61e5a8d8ced28b4697cae395f35e46c (diff)
lavc/movtextdec.c: Avoid infinite loop on invalid data.
Signed-off-by: Sasi Inguva <isasi@google.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/movtextdec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index abf8711a9c..a33fff7518 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -471,6 +471,10 @@ static int mov_text_decode_frame(AVCodecContext *avctx,
tsmb_type = AV_RB32(tsmb);
tsmb += 4;
+ if (tsmb_size == 0) {
+ return AVERROR_INVALIDDATA;
+ }
+
if (tsmb_size == 1) {
if (m->tracksize + 16 > avpkt->size)
break;