From: Michael Niedermayer <mich...@niedermayer.cc>
Fixes memleak
Fixes Ticket5169
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavformat/matroskadec.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 3743d4d..9c523fb 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -592,6 +592,8 @@ static EbmlSyntax matroska_clusters_incremental[] = {
static const char *const matroska_doctypes[] = { "matroska", "webm" };
+static int matroska_read_close(AVFormatContext *s);
+
static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos)
{
AVIOContext *pb = matroska->ctx->pb;
@@ -2099,7 +2101,7 @@ static int matroska_read_header(AVFormatContext *s)
while (res != 1) {
res = matroska_resync(matroska, pos);
if (res < 0)
- return res;
+ goto fail;
pos = avio_tell(matroska->ctx->pb);
res = ebml_parse(matroska, matroska_segment, matroska);
}
@@ -2114,7 +2116,7 @@ static int matroska_read_header(AVFormatContext *s)
res = matroska_parse_tracks(s);
if (res < 0)
- return res;
+ goto fail;
attachments = attachments_list->elem;
for (j = 0; j < attachments_list->nb_elem; j++) {
@@ -2187,6 +2189,9 @@ static int matroska_read_header(AVFormatContext *s)
matroska_convert_tags(s);
return 0;
+fail:
+ matroska_read_close(s);
+ return res;
}
/*
--
2.7.4
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
