[FFmpeg-cvslog] westwood_vqa: do not free extradata on error in read_header
Luca Barbato
git at videolan.org
Tue Aug 27 16:51:16 CEST 2013
ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Thu Jun 27 04:30:20 2013 +0200| [e7800543fe804dde114e4d86d7ab053a5b5516da] | committer: Luca Barbato
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 at libav.org
(cherry picked from commit 76f5dfbfd902178df4a38221a68dc8540189345a)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7800543fe804dde114e4d86d7ab053a5b5516da
---
libavformat/westwood_vqa.c | 2 --
1 file changed, 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]);
More information about the ffmpeg-cvslog
mailing list