X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=conf-parser.c;h=5da55874085c2cc0604320d41eca77ca38e9135f;hp=4075465b2496719bfec6275eddc22d4c68f55e99;hb=16801e901e87f4ca0c83ea8c09df1ab3d344129e;hpb=a7334b0952ab66c17ee787e36e6d2c5ceb387de6

diff --git a/conf-parser.c b/conf-parser.c
index 4075465b2..5da558740 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;
@@ -365,8 +368,12 @@ int config_parse_strv(
         if (!(n = new(char*, k+1)))
                 return -ENOMEM;
 
-        for (k = 0; (*sv)[k]; k++)
-                n[k] = (*sv)[k];
+        if (*sv)
+                for (k = 0; (*sv)[k]; k++)
+                        n[k] = (*sv)[k];
+        else
+                k = 0;
+
         FOREACH_WORD_QUOTED(w, l, rvalue, state)
                 if (!(n[k++] = strndup(w, l)))
                         goto fail;