From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 20 Jun 2008 21:06:53 +0000 (+0000)
Subject: fix the previous commit
X-Git-Tag: release-0.7.3~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=11864a706a6b109ec462d3d6be7413713de88846;p=nginx.git

fix the previous commit
---

diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c
index 8c69db773..971887fd4 100644
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -159,14 +159,19 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size)
 
     psize = (size_t) (pool->d.end - (u_char *) pool);
 
-    new = ngx_alloc(size, pool->log);
-    if (new == NULL) {
+    m = ngx_alloc(psize, pool->log);
+    if (m == NULL) {
         return NULL;
     }
 
-    new->d.end = (u_char *) new + psize;
+    new = (ngx_pool_t *) m;
+
+    new->d.end = m + psize;
     new->d.next = NULL;
 
+    m += sizeof(ngx_pool_data_t);
+    new->d.last = m + size;
+
     current = pool->current;
 
     for (p = current; p->d.next; p = p->d.next) {
@@ -179,9 +184,6 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size)
 
     pool->current = current ? current : new;
 
-    m = (u_char *) new + sizeof(ngx_pool_data_t);
-    new->d.last = m + size;
-
     return m;
 }