r1646 merge:

the simple expression has the same precision without overflow

1 files changed, 1 insertions, 4 deletions

diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
index daf563913..9f63a91eb 100644
--- a/src/core/ngx_slab.c
+++ b/src/core/ngx_slab.c
@@ -111,10 +111,7 @@ ngx_slab_init(ngx_slab_pool_t *pool)
 
     p += n * sizeof(ngx_slab_page_t);
 
-    /* STUB: possible overflow on 64-bit platform */
-    pages = (ngx_uint_t) ((uint64_t) size * ngx_pagesize
-                          / (ngx_pagesize + sizeof(ngx_slab_page_t))
-                              / ngx_pagesize);
+    pages = (ngx_uint_t) (size / (ngx_pagesize + sizeof(ngx_slab_page_t)));
 
     ngx_memzero(p, pages * sizeof(ngx_slab_page_t));