From 63ad1ab4f333351914abf0c3e78d4b3fa2e1cb66 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 6 Apr 2010 02:36:41 +0200 Subject: [PATCH] conf-parser: don't close FILE* object if we didn't open it --- conf-parser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conf-parser.c b/conf-parser.c index 4075465b2..aebf61aaf 100644 --- a/conf-parser.c +++ b/conf-parser.c @@ -135,6 +135,7 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co unsigned line = 0; char *section = NULL; int r; + bool ours = false; assert(filename); assert(t); @@ -145,6 +146,8 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co log_error("Failed to open configuration file '%s': %s", filename, strerror(-r)); goto finish; } + + ours = true; } while (!feof(f)) { @@ -168,7 +171,7 @@ int config_parse(const char *filename, FILE *f, const char* const * sections, co finish: free(section); - if (f) + if (f && ours) fclose(f); return r; -- 2.30.2