r1318, r1319, r1320, r1321 merge:

fix various bugs found by Coverity's Scan

1 files changed, 5 insertions, 2 deletions

diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index cef4dc1b8..92c74d699 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -456,6 +456,9 @@ ngx_walk_tree(ngx_tree_ctx_t *ctx, ngx_str_t *tree)
         }
 
         ctx->data = data;
+
+    } else {
+        data = NULL;
     }
 
     for ( ;; ) {
@@ -581,8 +584,8 @@ done:
         ngx_free(buf.data);
     }
 
-    if (ctx->alloc) {
-        ngx_free(ctx->data);
+    if (data) {
+        ngx_free(data);
         ctx->data = prev;
     }