[FFmpeg-cvslog] avcodec/microdvddec: add some memory checks
Clément Bœsch
git at videolan.org
Sun Sep 21 18:45:56 CEST 2014
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Sep 20 21:58:27 2014 +0200| [ac95b436db734cd72e637cef40e11bba2bf5da7d] | committer: Clément Bœsch
avcodec/microdvddec: add some memory checks
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac95b436db734cd72e637cef40e11bba2bf5da7d
---
libavcodec/microdvddec.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/libavcodec/microdvddec.c b/libavcodec/microdvddec.c
index 7df3e48..1347510 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,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;
More information about the ffmpeg-cvslog
mailing list