mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-23 09:45:06 +02:00
Check for failed extradata malloc, fixes a crash in out-of-memory conditions
or with extremely large extradata. Originally committed as revision 19333 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5a4a4d7839
commit
3dcddf82ed
@ -483,6 +483,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
||||
if(size > 10*4 && size<(1<<30)){
|
||||
st->codec->extradata_size= size - 10*4;
|
||||
st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
|
||||
if (!st->codec->extradata) {
|
||||
st->codec->extradata_size= 0;
|
||||
return AVERROR(ENOMEM);
|
||||
}
|
||||
get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user