Merge remote branch 'uci_upstream_remote/master' into uci_upstream_merge

[uci.git] / file.c

diff --git a/file.c b/file.c
index 5ab50a911a88e9f5cc510d8399b3fb309d6b8569..60946ef7d710cd76ad2aac939cd31ad6ad97a180 100644 (file)
--- a/file.c
+++ b/file.c
@@ -808,7 +808,7 @@ static char **uci_list_config_files(struct uci_context *ctx)
 static struct uci_package *uci_file_load(struct uci_context *ctx, const char *name)
 {
        struct uci_package *package = NULL;
-       char *filename;
+       char *filename = NULL;
        bool confdir;
        FILE *file = NULL;
 
@@ -845,8 +845,10 @@ static struct uci_package *uci_file_load(struct uci_context *ctx, const char *na
 
 done:
        uci_close_stream(file);
-       if (ctx->err)
+       if (ctx->err) {
+               free(filename);
                UCI_THROW(ctx, ctx->err);
+       }
        return package;
 }