commit 0fcc71934b7b31e6417054c384d6949bff022c31
author Steve Hay <stevehay@apache.org> Mon Feb 22 14:22:21 2021 +0000
committer Steve Hay <stevehay@apache.org> Mon Feb 22 14:22:21 2021 +0000
tree fd5a117645a1eea5948c5c5f2a0b0d45764daf51
parent c4b0914071f962c4d21eca7caf297d5709fe78a6

Fix SIGSEGV crash due to wrong use of perl_parse()

Patch by Charles Pigott <cpigott@rapitasystems.com>.

git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1886793 13f79535-47bb-0310-9956-ffa450edef68

src/modules/perl/modperl_config.c

diff --git a/src/modules/perl/modperl_config.c b/src/modules/perl/modperl_config.c
index 65afb6a..6603065 100644
--- a/src/modules/perl/modperl_config.c
+++ b/src/modules/perl/modperl_config.c
@@ -163,7 +163,8 @@
     scfg->PerlPostConfigRequire =
         apr_array_make(p, 1, sizeof(modperl_require_file_t *));
 
-    scfg->argv = apr_array_make(p, 2, sizeof(char *));
+    /* 2 arguments + NULL terminator */
+    scfg->argv = apr_array_make(p, 3, sizeof(char *));
 
     scfg->setvars = apr_table_make(p, 2);
     scfg->configvars = apr_table_make(p, 2);
@@ -219,6 +220,9 @@
 
     *argc = scfg->argv->nelts;
 
+    /* perl_parse() expects a NULL terminated argv array */
+    modperl_config_srv_argv_push(NULL);
+
     MP_TRACE_g_do(dump_argv(scfg));
 
     return (char **)scfg->argv->elts;