virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/textdec: add some memory checks

Browse Source
This commit is contained in:
Clément Bœsch 2014-09-20 22:18:50 +02:00
parent 947a5111dd
commit 36c3a0167a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/textdec.c
View File

@ -44,6 +44,7 @@ static const AVOption options[] = {
static int text_decode_frame(AVCodecContext *avctx, void *data, static int text_decode_frame(AVCodecContext *avctx, void *data,
int *got_sub_ptr, AVPacket *avpkt) int *got_sub_ptr, AVPacket *avpkt)
{ {
int ret = 0;
AVBPrint buf; AVBPrint buf;
AVSubtitle *sub = data; AVSubtitle *sub = data;
const char *ptr = avpkt->data; const char *ptr = avpkt->data;
@ -55,14 +56,12 @@ static int text_decode_frame(AVCodecContext *avctx, void *data,
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
if (ptr && avpkt->size > 0 && *ptr) { if (ptr && avpkt->size > 0 && *ptr) {
ff_ass_bprint_text_event(&buf, ptr, avpkt->size, text->linebreaks, text->keep_ass_markup); ff_ass_bprint_text_event(&buf, ptr, avpkt->size, text->linebreaks, text->keep_ass_markup);
if (!av_bprint_is_complete(&buf)) { ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration, 0);
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;
av_bprint_finalize(&buf, NULL); av_bprint_finalize(&buf, NULL);
if (ret < 0)
return ret;
*got_sub_ptr = sub->num_rects > 0;
return avpkt->size; return avpkt->size;
} }