Mercurial > hg > nginx

diff src/core/ngx_file.c @ 1326:ccd8734e4a80 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1318, r1319, r1320, r1321 merge: fix various bugs found by Coverity's Scan
author Igor Sysoev <igor@sysoev.ru>
date Sun, 22 Jul 2007 08:40:39 +0000
parents 58f1641783ca
children d59617e7e6a1
line wrap: on
line diff
--- 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_s
         }
 
         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;
     }