diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-06-27 04:30:20 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-09-13 15:27:55 +0200 |
| commit | 26589aa81028f42c763c5581a1486a271799890b (patch) | |
| tree | a46eecf915805f7efccb8980eb545ff1d57813fd | |
| parent | c6942a4b037476ca097036e99bb509b5e5d59128 (diff) | |
| download | ffmpeg-26589aa81028f42c763c5581a1486a271799890b.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
(cherry picked from commit 76f5dfbfd902178df4a38221a68dc8540189345a)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavformat/westwood.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/westwood.c b/libavformat/westwood.c index 82b7e94840..47e835ad10 100644 --- a/libavformat/westwood.c +++ b/libavformat/westwood.c @@ -240,7 +240,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]); @@ -279,7 +278,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]); |