Merge of r4018:

Fix buffer overrun under Windows.

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 424bd6550ac74e6745ad3d60b88c1cebf58cb2c7..25690eb0f8ba219f517b87da6040f5ff063db075 100644 (file)
--- 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;
     }