]> git.kaiwu.me - nginx.git/commitdiff
Perl: NULL-terminate argument list.
authorPiotr Sikora <piotr@cloudflare.com>
Thu, 19 Jun 2014 11:16:36 +0000 (04:16 -0700)
committerPiotr Sikora <piotr@cloudflare.com>
Thu, 19 Jun 2014 11:16:36 +0000 (04:16 -0700)
perl_parse() function expects argv/argc-style argument list,
which according to the C standard must be NULL-terminated,
that is: argv[argc] == NULL.

This change fixes a crash (SIGSEGV) that could happen because
of the buffer overrun during perl module initialization.

Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
src/http/modules/perl/ngx_http_perl_module.c

index bf4d1fe9ad78bbf71525cb96bc4bce3e16bc4b1a..6a8894cc3b1a559fcb955b6d66f7a56d4603b30f 100644 (file)
@@ -577,7 +577,7 @@ ngx_http_perl_create_interpreter(ngx_conf_t *cf,
 
     n = (pmcf->modules != NGX_CONF_UNSET_PTR) ? pmcf->modules->nelts * 2 : 0;
 
-    embedding = ngx_palloc(cf->pool, (4 + n) * sizeof(char *));
+    embedding = ngx_palloc(cf->pool, (5 + n) * sizeof(char *));
     if (embedding == NULL) {
         goto fail;
     }
@@ -595,6 +595,7 @@ ngx_http_perl_create_interpreter(ngx_conf_t *cf,
     embedding[n++] = "-Mnginx";
     embedding[n++] = "-e";
     embedding[n++] = "0";
+    embedding[n] = NULL;
 
     n = perl_parse(perl, ngx_http_perl_xs_init, n, embedding, NULL);