diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 12:13:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 12:13:41 +0200 |
| commit | 72eddc10fa1f3ca7fb95292673fa26401f754c92 (patch) | |
| tree | 878039cdab1f882bc68a9e60203e430d42eb8d54 /libavformat/oggparsevorbis.c | |
| parent | 328a5b93d3a493d6a653a83c425fb2cc98e8f41b (diff) | |
| parent | d872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9 (diff) | |
| download | ffmpeg-72eddc10fa1f3ca7fb95292673fa26401f754c92.tar.gz | |
Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'
* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9':
lavf: Reset the entry count and allocation size variables on av_reallocp failures
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparsevorbis.c')
| -rw-r--r-- | libavformat/oggparsevorbis.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 40833cb344..48f5f8183e 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -317,9 +317,12 @@ vorbis_header (AVFormatContext * s, int idx) } } } else { - int ret; - st->codec->extradata_size = - fixup_vorbis_headers(s, priv, &st->codec->extradata); + int ret = fixup_vorbis_headers(s, priv, &st->codec->extradata); + if (ret < 0) { + st->codec->extradata_size = 0; + return ret; + } + st->codec->extradata_size = ret; if ((ret = avpriv_vorbis_parse_extradata(st->codec, &priv->vp))) { av_freep(&st->codec->extradata); st->codec->extradata_size = 0; |