summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-06-27 04:30:20 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-07-07 22:04:43 +0200
commit76f5dfbfd902178df4a38221a68dc8540189345a (patch)
tree63e6862bc44c4c8d25313674c0cb5983cf0bcf28
parentc4abc9098cacb227dba39bac6aea16b2bceba0d0 (diff)
downloadffmpeg-streaming-76f5dfbfd902178df4a38221a68dc8540189345a.zip
ffmpeg-streaming-76f5dfbfd902178df4a38221a68dc8540189345a.tar.gz
westwood_vqa: do not free extradata on error in read_header
The extradata is already freed by avformat_open_input on failure. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
-rw-r--r--libavformat/westwood_vqa.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
index 7c9cb0d..77da375 100644
--- a/libavformat/westwood_vqa.c
+++ b/libavformat/westwood_vqa.c
@@ -106,7 +106,6 @@ static int wsvqa_read_header(AVFormatContext *s)
header = (unsigned char *)st->codec->extradata;
if (avio_read(pb, st->codec->extradata, VQA_HEADER_SIZE) !=
VQA_HEADER_SIZE) {
- av_free(st->codec->extradata);
return AVERROR(EIO);
}
st->codec->width = AV_RL16(&header[6]);
@@ -132,7 +131,6 @@ static int wsvqa_read_header(AVFormatContext *s)
* FINF has been skipped and the file will be ready to be demuxed */
do {
if (avio_read(pb, scratch, VQA_PREAMBLE_SIZE) != VQA_PREAMBLE_SIZE) {
- av_free(st->codec->extradata);
return AVERROR(EIO);
}
chunk_tag = AV_RB32(&scratch[0]);
OpenPOWER on IntegriCloud