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

matroskadec: increase padding on several more extradata allocations.

Browse Source 
Inspired by: 5af569aa30b93f56344ea540936eb671760f568c by alex
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-01-26 17:22:34 +01:00
parent 5af569aa30
commit 1860c66c54
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/matroskadec.c
View File

@ -1503,7 +1503,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
extradata_size = 2; extradata_size = 2;
} else if (codec_id == CODEC_ID_TTA) { } else if (codec_id == CODEC_ID_TTA) {
extradata_size = 30; extradata_size = 30;
extradata = av_mallocz(extradata_size); extradata = av_mallocz(extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (extradata == NULL) if (extradata == NULL)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ffio_init_context(&b, extradata, extradata_size, 1, ffio_init_context(&b, extradata, extradata_size, 1,
@ -1642,7 +1642,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
av_dict_set(&st->metadata, "mimetype", attachements[j].mime, 0); av_dict_set(&st->metadata, "mimetype", attachements[j].mime, 0);
st->codec->codec_id = CODEC_ID_NONE; st->codec->codec_id = CODEC_ID_NONE;
st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT; st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
st->codec->extradata = av_malloc(attachements[j].bin.size); st->codec->extradata = av_malloc(attachements[j].bin.size + FF_INPUT_BUFFER_PADDING_SIZE);
if(st->codec->extradata == NULL) if(st->codec->extradata == NULL)
break; break;
st->codec->extradata_size = attachements[j].bin.size; st->codec->extradata_size = attachements[j].bin.size;