From: Clément Bœsch Date: Sat, 20 Sep 2014 20:11:45 +0000 (+0200) Subject: avcodec/realtextdec: add some memory checks X-Git-Tag: n2.6-dev~1408 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/8e7808b524d1e2a0063b1a0476a1fee2ac5742b5 avcodec/realtextdec: add some memory checks --- diff --git a/libavcodec/realtextdec.c b/libavcodec/realtextdec.c index 4578897..602df4c 100644 --- a/libavcodec/realtextdec.c +++ b/libavcodec/realtextdec.c @@ -59,6 +59,7 @@ static int rt_event_to_ass(AVBPrint *buf, const char *p) static int realtext_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; @@ -67,9 +68,11 @@ static int realtext_decode_frame(AVCodecContext *avctx, // note: no need to rescale pts & duration since they are in the same // timebase as ASS (1/100) if (ptr && avpkt->size > 0 && !rt_event_to_ass(&buf, ptr)) - ff_ass_add_rect(sub, buf.str, avpkt->pts, avpkt->duration, 0); - *got_sub_ptr = sub->num_rects > 0; + ret = ff_ass_add_rect_bprint(sub, &buf, avpkt->pts, avpkt->duration, 0); av_bprint_finalize(&buf, NULL); + if (ret < 0) + return ret; + *got_sub_ptr = sub->num_rects > 0; return avpkt->size; }