From ae895a40c55e25d0b62687cda2a871dfa1b1b8b0 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 19 Dec 2004 20:25:55 +0000
Subject: [PATCH] 10l (double free)
Originally committed as revision 3764 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/img2.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 158bf485a12..f6fa8af44b4 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -155,7 +155,6 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st = av_new_stream(s1, 0);
if (!st) {
- av_free(s);
return -ENOMEM;
}
@@ -181,7 +180,7 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
if (!s->is_pipe) {
if (find_image_range(&first_index, &last_index, s->path) < 0)
- goto fail;
+ return AVERROR_IO;
s->img_first = first_index;
s->img_last = last_index;
s->img_number = first_index;
@@ -204,10 +203,6 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
}
return 0;
-
- fail:
- av_free(s);
- return AVERROR_IO;
}
static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
--
GitLab