[FFmpeg-cvslog] avcodec/mpl2dec: add some memory checks

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Sep 20 22:02:26 2014 +0200| [27a9bee243c7990ad0c6f9d6bd9ae34d2000f1dd] | committer: Clément Bœsch

avcodec/mpl2dec: add some memory checks

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27a9bee243c7990ad0c6f9d6bd9ae34d2000f1dd
---

 libavcodec/mpl2dec.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/libavcodec/mpl2dec.c b/libavcodec/mpl2dec.c
index a777c7c..5cce6d5 100644
--- a/libavcodec/mpl2dec.c
+++ b/libavcodec/mpl2dec.c
@@ -66,6 +66,7 @@ static int mpl2_event_to_ass(AVBPrint *buf, const char *p)
 static int mpl2_decode_frame(AVCodecContext *avctx, void *data,
                              int *got_sub_ptr, AVPacket *avpkt)
 {
+    int ret = 0;
     AVBPrint buf;
     AVSubtitle *sub = data;
     const char *ptr = avpkt->data;
@@ -74,15 +75,12 @@ static int mpl2_decode_frame(AVCodecContext *avctx, void *data,
                              av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1;
 
     av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
-    if (ptr && avpkt->size > 0 && *ptr && !mpl2_event_to_ass(&buf, ptr)) {
-        if (!av_bprint_is_complete(&buf)) {
-            av_bprint_finalize(&buf, NULL);
-            return AVERROR(ENOMEM);
-        }
-        ff_ass_add_rect(sub, buf.str, ts_start, ts_duration, 0);
-    }
-    *got_sub_ptr = sub->num_rects > 0;
+    if (ptr && avpkt->size > 0 && *ptr && !mpl2_event_to_ass(&buf, ptr))
+        ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration, 0);
     av_bprint_finalize(&buf, NULL);
+    if (ret < 0)
+        return ret;
+    *got_sub_ptr = sub->num_rects > 0;
     return avpkt->size;
 }