From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 6 Apr 2010 00:36:41 +0000 (+0200)
Subject: conf-parser: don't close FILE* object if we didn't open it
X-Git-Tag: v1~662
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=63ad1ab4f333351914abf0c3e78d4b3fa2e1cb66;p=elogind.git

conf-parser: don't close FILE* object if we didn't open it
---

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;