Mercurial > hg > nginx

diff src/core/ngx_conf_file.c @ 6163:4e71788460fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed excessive memory usage while parsing configuration. The b->pos points to the next symbol here. Reported by ilexshen.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 01 Jun 2015 21:08:56 +0300
parents f87afb46ccd2
children 1b7e246e6b38
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c	Mon Jun 01 16:58:07 2015 +0300
+++ b/src/core/ngx_conf_file.c	Mon Jun 01 21:08:56 2015 +0300
@@ -680,7 +680,7 @@
                     return NGX_ERROR;
                 }
 
-                word->data = ngx_pnalloc(cf->pool, b->pos - start + 1);
+                word->data = ngx_pnalloc(cf->pool, b->pos - 1 - start + 1);
                 if (word->data == NULL) {
                     return NGX_ERROR;
                 }