har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mpeg: Add padding to extradata

Browse Source 
Extradata is supposed to be padded with AV_INPUT_BUFFER_PADDING_SIZE bytes,
yet the VobSub demuxer used av_strdup for the allocation of extradata.
This has been changed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Andreas Rheinhardt 2019-10-22 15:16:42 +02:00 committed by Michael Niedermayer
parent ac0f5f4c17
commit c36eae65e4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mpeg.c
View File

@ -769,7 +769,7 @@ static int vobsub_read_header(AVFormatContext *s)
goto end; goto end;
} }
av_bprint_init(&header, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&header, 0, INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE);
while (!avio_feof(s->pb)) { while (!avio_feof(s->pb)) {
char line[MAX_LINE_SIZE]; char line[MAX_LINE_SIZE];
int len = ff_get_line(s->pb, line, sizeof(line)); int len = ff_get_line(s->pb, line, sizeof(line));
@ -896,14 +896,12 @@ static int vobsub_read_header(AVFormatContext *s)
} }
av_bprint_finalize(&header, &header_str); av_bprint_finalize(&header, &header_str);
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *sub_st = s->streams[i]; AVCodecParameters *par = s->streams[i]->codecpar;
sub_st->codecpar->extradata = av_strdup(header_str); ret = ff_alloc_extradata(par, header.len);
if (!sub_st->codecpar->extradata) { if (ret < 0) {
ret = AVERROR(ENOMEM);
sub_st->codecpar->extradata_size = 0;
goto end; goto end;
} }
sub_st->codecpar->extradata_size = header.len; memcpy(par->extradata, header_str, header.len);
} }
end: end: