generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/movtextdec: add some memory checks

Browse Source
This commit is contained in:
Clément Bœsch 2014-09-20 22:00:21 +02:00
parent ac95b436db
commit e833b02f2f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/movtextdec.c
View File

@ -60,7 +60,7 @@ static int mov_text_decode_frame(AVCodecContext *avctx,
void *data, int *got_sub_ptr, AVPacket *avpkt) void *data, int *got_sub_ptr, AVPacket *avpkt)
{ {
AVSubtitle *sub = data; AVSubtitle *sub = data;
int ts_start, ts_end; int ret, ts_start, ts_end;
AVBPrint buf; AVBPrint buf;
const char *ptr = avpkt->data; const char *ptr = avpkt->data;
const char *end; const char *end;
@ -96,13 +96,11 @@ static int mov_text_decode_frame(AVCodecContext *avctx,
// Note that the spec recommends lines be no longer than 2048 characters. // Note that the spec recommends lines be no longer than 2048 characters.
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
text_to_ass(&buf, ptr, end); text_to_ass(&buf, ptr, end);
ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_end-ts_start, 0);
if (!av_bprint_is_complete(&buf))
return AVERROR(ENOMEM);
ff_ass_add_rect(sub, buf.str, ts_start, ts_end-ts_start, 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;
} }