From 76f5dfbfd902178df4a38221a68dc8540189345a Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Thu, 27 Jun 2013 04:30:20 +0200
Subject: [PATCH] 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
---
libavformat/westwood_vqa.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
index 7c9cb0db81a..77da375e70c 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]);
--
GitLab