[FFmpeg-devel] [PATCH 10/17] avcodec/webvttdec: add some memory checks
Clément Bœsch
u at pkh.me
Sat Sep 20 22:27:50 CEST 2014
---
libavcodec/webvttdec.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c
index 6b86bed..411abf0 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,15 @@ 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);
+ if (!av_bprint_is_complete(&buf))
+ ret = AVERROR(ENOMEM);
+ else
+ ret = ff_ass_add_rect(sub, buf.str, 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;
}
--
2.1.0
More information about the ffmpeg-devel
mailing list