diff options
Diffstat (limited to 'src/core/ngx_palloc.c')
| -rw-r--r-- | src/core/ngx_palloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index fe469ec2d..37a0868c1 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -70,8 +70,9 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size) ngx_pool_t *p, *n; ngx_pool_large_t *large, *last; - if (size <= (size_t) NGX_MAX_ALLOC_FROM_POOL) { - + if (size <= (size_t) NGX_MAX_ALLOC_FROM_POOL + && size <= (size_t) (pool->end - (char *) pool)) + { for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { m = ngx_align(p->last); |