From 07a866282f08985c65c47ebabcf7b20f1c46daa0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 20 Nov 2012 15:12:37 +0100 Subject: [PATCH] oggdec: fix memleak on header parsing failure Fixes Ticket1931 Signed-off-by: Michael Niedermayer --- libavformat/oggdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 0fce8986b1..3ca33dcb63 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -57,6 +57,7 @@ static const struct ogg_codec * const ogg_codecs[] = { }; static int64_t ogg_calc_pts(AVFormatContext *s, int idx, int64_t *dts); +static int ogg_read_close(AVFormatContext *s); //FIXME We could avoid some structure duplication static int ogg_save(AVFormatContext *s) @@ -596,8 +597,10 @@ static int ogg_read_header(AVFormatContext *s) //linear headers seek from start do { ret = ogg_packet(s, NULL, NULL, NULL, NULL); - if (ret < 0) + if (ret < 0) { + ogg_read_close(s); return ret; + } } while (!ogg->headers); av_dlog(s, "found headers\n");