[FFmpeg-devel] [PATCH 08/17] avcodec/subviewerdec: add some memory checks

[Clément Bœsch]

---
 libavcodec/subviewerdec.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libavcodec/subviewerdec.c b/libavcodec/subviewerdec.c
index 63be418..470cd7b 100644
--- a/libavcodec/subviewerdec.c
+++ b/libavcodec/subviewerdec.c
@@ -51,6 +51,7 @@ static int subviewer_decode_frame(AVCodecContext *avctx,
                                   void *data, int *got_sub_ptr, AVPacket *avpkt)
 {
     char c;
+    int ret = 0;
     AVSubtitle *sub = data;
     const char *ptr = avpkt->data;
     AVBPrint buf;
@@ -66,10 +67,16 @@ static int subviewer_decode_frame(AVCodecContext *avctx,
     av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
     // note: no need to rescale pts & duration since they are in the same
     // timebase as ASS (1/100)
-    if (ptr && avpkt->size > 0 && !subviewer_event_to_ass(&buf, ptr))
-        ff_ass_add_rect(sub, buf.str, avpkt->pts, avpkt->duration, 0);
-    *got_sub_ptr = sub->num_rects > 0;
+    if (ptr && avpkt->size > 0 && !subviewer_event_to_ass(&buf, ptr)) {
+        if (!av_bprint_is_complete(&buf))
+            ret = AVERROR(ENOMEM);
+        else
+            ret = ff_ass_add_rect(sub, buf.str, 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;
 }
 
-- 
2.1.0