avcodec/microdvddec: add some memory checks
authorClément Bœsch <u@pkh.me>
Sat, 20 Sep 2014 19:58:27 +0000 (21:58 +0200)
committerClément Bœsch <u@pkh.me>
Sun, 21 Sep 2014 16:41:45 +0000 (18:41 +0200)
libavcodec/microdvddec.c

index 7df3e48..1347510 100644 (file)
@@ -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,18 @@ 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");
+        ret = ff_ass_add_rect_bprint(sub, &new_line, ts_start, ts_duration, 0);
+        av_bprint_finalize(&new_line, NULL);
+        if (ret < 0)
+            return ret;
     }
 
     *got_sub_ptr = sub->num_rects > 0;