summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-08-29 13:11:47 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-08-29 13:11:47 +0000
commitee7216bfa68ecc204f4a9b9154f18a9f284a7c3a (patch)
tree0d43858cfcdefdd827161c9d6f2a8d3a7ce57351
parent8f8839f98db7c44f821e68f28614094e30fb8b22 (diff)
downloadnginx-ee7216bfa68ecc204f4a9b9154f18a9f284a7c3a.tar.gz
nginx-ee7216bfa68ecc204f4a9b9154f18a9f284a7c3a.tar.bz2
Merge of r4018:
Fix buffer overrun under Windows.
-rw-r--r--src/os/win32/ngx_files.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 424bd6550..25690eb0f 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -228,7 +228,8 @@ ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log)
ngx_uint_t collision;
ngx_atomic_uint_t num;
- name = ngx_alloc(to->len + 1 + 10 + 1 + sizeof("DELETE"), log);
+ name = ngx_alloc(to->len + 1 + NGX_ATOMIC_T_LEN + 1 + sizeof("DELETE"),
+ log);
if (name == NULL) {
return NGX_ENOMEM;
}