diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-07-23 08:00:34 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2007-07-23 08:00:34 +0000 |
| commit | b9b71bc11c42dce8b014ee3cf3a1f5dc7b9ecc2f (patch) | |
| tree | 70408a0abe7d34411ac91e763b990cf5246887aa /src/core/ngx_file.c | |
| parent | 650a43160c4432dc3d3e778ea5840600cacf958a (diff) | |
| download | nginx-0.6.5.tar.gz | |
Changes with nginx 0.6.5 23 Jul 2007v0.6.5
*) Feature: $nginx_version variable.
Thanks to Nick S. Grechukh.
*) Feature: the mail proxy supports AUTHENTICATE in IMAP mode.
Thanks to Maxim Dounin.
*) Feature: the mail proxy supports STARTTLS in SMTP mode.
Thanks to Maxim Dounin.
*) Bugfix: now nginx escapes space in $memcached_key variable.
*) Bugfix: nginx was incorrectly built by Sun Studio on
Solaris/amd64.
Thanks to Jiang Hong.
*) Bugfix: of minor potential bugs.
Thanks to Coverity's Scan.
Diffstat (limited to 'src/core/ngx_file.c')
| -rw-r--r-- | src/core/ngx_file.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 55cfd7ca2..fcb8ff080 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -518,6 +518,9 @@ ngx_walk_tree(ngx_tree_ctx_t *ctx, ngx_str_t *tree) } ctx->data = data; + + } else { + data = NULL; } for ( ;; ) { @@ -643,8 +646,8 @@ done: ngx_free(buf.data); } - if (ctx->alloc) { - ngx_free(ctx->data); + if (data) { + ngx_free(data); ctx->data = prev; } |