From f01d7d230b1835ab035a5130e2a39f05f0aabdf5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 15 Dec 2009 18:59:03 +0100 Subject: input/file: don't fall back to parent directory This code has never made any sense, and has broken some of the archive plugin. --- src/input/file_input_plugin.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/input/file_input_plugin.c b/src/input/file_input_plugin.c index 64a4030ab..bda1777ac 100644 --- a/src/input/file_input_plugin.c +++ b/src/input/file_input_plugin.c @@ -36,25 +36,14 @@ input_file_open(struct input_stream *is, const char *filename) int fd, ret; struct stat st; - char* pathname = g_strdup(filename); - if (filename[0] != '/') - { - g_free(pathname); return false; - } - if (stat(filename, &st) < 0) { - char* slash = strrchr(pathname, '/'); - *slash = '\0'; - } - - fd = open(pathname, O_RDONLY); + fd = open(filename, O_RDONLY); if (fd < 0) { is->error = errno; g_debug("Failed to open \"%s\": %s", - pathname, g_strerror(errno)); - g_free(pathname); + filename, g_strerror(errno)); return false; } @@ -64,15 +53,13 @@ input_file_open(struct input_stream *is, const char *filename) if (ret < 0) { is->error = errno; close(fd); - g_free(pathname); return false; } if (!S_ISREG(st.st_mode)) { - g_debug("Not a regular file: %s", pathname); + g_debug("Not a regular file: %s", filename); is->error = EINVAL; close(fd); - g_free(pathname); return false; } @@ -86,8 +73,6 @@ input_file_open(struct input_stream *is, const char *filename) is->data = GINT_TO_POINTER(fd); is->ready = true; - g_free(pathname); - return true; } -- cgit v1.2.3 From 2234d491b7c1a8cbea0cb4e444fc72c37aec5016 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 15 Dec 2009 19:31:50 +0100 Subject: input/archive: close the archive file on error Fixed memory leak in error handler. --- src/input/archive_input_plugin.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/input/archive_input_plugin.c b/src/input/archive_input_plugin.c index 6239f4298..8e897f0c2 100644 --- a/src/input/archive_input_plugin.c +++ b/src/input/archive_input_plugin.c @@ -66,6 +66,7 @@ input_archive_open(struct input_stream *is, const char *pathname) if (!opened) { g_warning("open inarchive file %s failed\n\n",filename); + arplug->close(file); } else { is->ready = true; } -- cgit v1.2.3 From 6c0f50efb568a6da52e6c31920bc93c4254063c7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 15 Dec 2009 19:42:54 +0100 Subject: archive/bz2: removed NULL check before g_free() g_free(NULL) is allowed. --- src/archive/bz2_plugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/archive/bz2_plugin.c b/src/archive/bz2_plugin.c index 4db68f48e..78f13400a 100644 --- a/src/archive/bz2_plugin.c +++ b/src/archive/bz2_plugin.c @@ -140,8 +140,8 @@ static void bz2_close(struct archive_file *file) { bz2_context *context = (bz2_context *) file; - if (context->name) - g_free(context->name); + + g_free(context->name); input_stream_close(&context->istream); g_free(context); -- cgit v1.2.3 From 3411f6cffdcf3c72e7cee3a263c40414dfef956e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 15 Dec 2009 19:45:50 +0100 Subject: archive: close archive when stream is closed Fixes a memory leak: the "archive" input plugin opens the archive, but never closes it. This patch moves the responsibility for doing that to archive_plugin.open_stream(). This is an slight internal API change, but it is the simplest and least intrusive fix for the memory leak. --- src/archive/bz2_plugin.c | 2 ++ src/archive/iso_plugin.c | 2 ++ src/archive/zip_plugin.c | 2 ++ src/archive_api.h | 3 +++ 4 files changed, 9 insertions(+) (limited to 'src') diff --git a/src/archive/bz2_plugin.c b/src/archive/bz2_plugin.c index 78f13400a..0ef042e90 100644 --- a/src/archive/bz2_plugin.c +++ b/src/archive/bz2_plugin.c @@ -173,6 +173,8 @@ bz2_is_close(struct input_stream *is) bz2_context *context = (bz2_context *) is->data; bz2_destroy(context); is->data = NULL; + + bz2_close((struct archive_file *)context); } static int diff --git a/src/archive/iso_plugin.c b/src/archive/iso_plugin.c index d295f148f..7d2c075b1 100644 --- a/src/archive/iso_plugin.c +++ b/src/archive/iso_plugin.c @@ -165,6 +165,8 @@ iso_is_close(struct input_stream *is) { iso_context *context = (iso_context *) is->data; g_free(context->statbuf); + + iso_close((struct archive_file *)context); } diff --git a/src/archive/zip_plugin.c b/src/archive/zip_plugin.c index dbd2534fa..2f08b3812 100644 --- a/src/archive/zip_plugin.c +++ b/src/archive/zip_plugin.c @@ -133,6 +133,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 diff --git a/src/archive_api.h b/src/archive_api.h index dbd050bfa..2efcc1e6a 100644 --- a/src/archive_api.h +++ b/src/archive_api.h @@ -73,6 +73,9 @@ struct archive_plugin { /** * Opens an input_stream of a file within the archive. * + * If this function succeeds, then the #input_stream "owns" + * the archive file and will automatically close it. + * * @param path the path within the archive */ bool (*open_stream)(struct archive_file *, struct input_stream *is, -- cgit v1.2.3 From 9179f108a540dcd27dafeb015778cc4dd873dfe5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 15 Dec 2009 19:56:38 +0100 Subject: iso, zip: fixed memory leak in destructor Free the "context" pointer in the method archive_plugin.close(). --- src/archive/iso_plugin.c | 3 ++- src/archive/zip_plugin.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/archive/iso_plugin.c b/src/archive/iso_plugin.c index 7d2c075b1..9063af0fc 100644 --- a/src/archive/iso_plugin.c +++ b/src/archive/iso_plugin.c @@ -132,7 +132,8 @@ iso_close(struct archive_file *file) } //close archive iso9660_close(context->iso); - context->iso = NULL; + + g_free(context); } /* single archive handling */ diff --git a/src/archive/zip_plugin.c b/src/archive/zip_plugin.c index 2f08b3812..243d46418 100644 --- a/src/archive/zip_plugin.c +++ b/src/archive/zip_plugin.c @@ -99,7 +99,8 @@ zip_close(struct archive_file *file) } //close archive zzip_dir_close (context->dir); - context->dir = NULL; + + g_free(context); } /* single archive handling */ -- cgit v1.2.3