[FFmpeg-devel] [PATCH 02/17] avcodec/microdvddec: add some memory checks

[Clément Bœsch]

---
 libavcodec/microdvddec.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/libavcodec/microdvddec.c b/libavcodec/microdvddec.c
index 7df3e48..9db44e0 100644
--- a/libavcodec/microdvddec.c
+++ b/libavcodec/microdvddec.c
@@ -261,7 +261,6 @@ static int microdvd_decode_frame(AVCodecContext *avctx,
     AVSubtitle *sub = data;
     AVBPrint new_line;
     char c;
-    char *decoded_sub;
     char *line = avpkt->data;
     char *end = avpkt->data + avpkt->size;
     struct microdvd_tag tags[sizeof(MICRODVD_TAGS) - 1] = {{0}};
@@ -301,18 +300,21 @@ static int microdvd_decode_frame(AVCodecContext *avctx,
         }
     }
     if (new_line.len) {
-        av_bprintf(&new_line, "\r\n");
-
-        av_bprint_finalize(&new_line, &decoded_sub);
-        if (*decoded_sub) {
+        int ret;
             int64_t start    = avpkt->pts;
             int64_t duration = avpkt->duration;
             int ts_start     = av_rescale_q(start,    avctx->time_base, (AVRational){1,100});
             int ts_duration  = duration != -1 ?
                 av_rescale_q(duration, avctx->time_base, (AVRational){1,100}) : -1;
-            ff_ass_add_rect(sub, decoded_sub, ts_start, ts_duration, 0);
-        }
-        av_free(decoded_sub);
+
+        av_bprintf(&new_line, "\r\n");
+        if (!av_bprint_is_complete(&new_line))
+            ret = AVERROR(ENOMEM);
+        else
+            ret = ff_ass_add_rect(sub, new_line.str, ts_start, ts_duration, 0);
+        av_bprint_finalize(&new_line, NULL);
+        if (ret < 0)
+            return ret;
     }
 
     *got_sub_ptr = sub->num_rects > 0;
-- 
2.1.0