aboutsummaryrefslogtreecommitdiffstats
path: root/src/archive/zip_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-12-15 20:26:38 +0100
committerMax Kellermann <max@duempel.org>2009-12-15 20:26:38 +0100
commit530e480748854f43819c3dd1dbe6418c343b4f64 (patch)
tree488824927e465de0e55b8d10f6c03389f7deeeab /src/archive/zip_plugin.c
parent95c3f283ea5a50a344b63af82718ac765229e8da (diff)
parent9179f108a540dcd27dafeb015778cc4dd873dfe5 (diff)
downloadmpd-530e480748854f43819c3dd1dbe6418c343b4f64.tar.gz
mpd-530e480748854f43819c3dd1dbe6418c343b4f64.tar.xz
mpd-530e480748854f43819c3dd1dbe6418c343b4f64.zip
Merge branch 'v0.15.x'
Conflicts: src/archive/bz2_plugin.c src/archive_api.h src/input/file_input_plugin.c test/run_input.c
Diffstat (limited to '')
-rw-r--r--src/archive/zip_plugin.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/archive/zip_plugin.c b/src/archive/zip_plugin.c
index 9078c2d32..95bc1d02b 100644
--- a/src/archive/zip_plugin.c
+++ b/src/archive/zip_plugin.c
@@ -100,7 +100,8 @@ zip_close(struct archive_file *file)
}
//close archive
zzip_dir_close (context->dir);
- context->dir = NULL;
+
+ g_free(context);
}
/* single archive handling */
@@ -134,6 +135,8 @@ zip_is_close(struct input_stream *is)
{
zip_context *context = (zip_context *) is->data;
zzip_file_close (context->file);
+
+ zip_close((struct archive_file *)context);
}
static size_t