summaryrefslogtreecommitdiff
path: root/libavcodec/webvttdec.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2014-09-20 22:20:05 +0200
committerClément Bœsch <u@pkh.me>2014-09-21 18:41:45 +0200
commitce8dc93aefb4bb76507c0b6107f513c773ad25f8 (patch)
tree38ddb680fd4f61482f07be0534bf7cae6ebb3602 /libavcodec/webvttdec.c
parent36c3a0167a324d4d58226fdf0fa25d3cd1314e7c (diff)
downloadffmpeg-ce8dc93aefb4bb76507c0b6107f513c773ad25f8.tar.gz
avcodec/webvttdec: add some memory checks
Diffstat (limited to 'libavcodec/webvttdec.c')
-rw-r--r--libavcodec/webvttdec.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c
index 6b86bedbe9..8ca017bee7 100644
--- a/libavcodec/webvttdec.c
+++ b/libavcodec/webvttdec.c
@@ -74,6 +74,7 @@ static int webvtt_event_to_ass(AVBPrint *buf, const char *p)
static int webvtt_decode_frame(AVCodecContext *avctx,
void *data, int *got_sub_ptr, AVPacket *avpkt)
{
+ int ret = 0;
AVSubtitle *sub = data;
const char *ptr = avpkt->data;
AVBPrint buf;
@@ -83,10 +84,12 @@ static int webvtt_decode_frame(AVCodecContext *avctx,
int ts_start = av_rescale_q(avpkt->pts, avctx->time_base, (AVRational){1,100});
int ts_duration = avpkt->duration != -1 ?
av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1;
- ff_ass_add_rect(sub, buf.str, ts_start, ts_duration, 0);
+ ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration, 0);
}
- *got_sub_ptr = sub->num_rects > 0;
av_bprint_finalize(&buf, NULL);
+ if (ret < 0)
+ return ret;
+ *got_sub_ptr = sub->num_rects > 0;
return avpkt->size;
}