Merge branch 'pull-request/313' into PHP-5.5

keyurdg · keyurdg · commit b2a760fe4564 · 2013-03-29T14:42:16.000Z
* pull-request/313:
  Patch for Bug #64544. The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
@@ -1402,7 +1402,7 @@ int main(int argc, char *argv[])
 	 * Do not move this de-initialization. It needs to happen right before
 	 * exiting.
 	 */
-        cleanup_ps_args(argv);
+	cleanup_ps_args(argv);
 	exit(exit_status);
 }
 /* }}} */
diff --git a/sapi/cli/ps_title.c b/sapi/cli/ps_title.c
@@ -124,6 +124,11 @@ static size_t ps_buffer_cur_len; /* actual string length in ps_buffer */
 static int save_argc;
 static char** save_argv;
 
+/* 
+ * This holds the 'locally' allocated environ from the save_ps_args method.
+ * This is subsequently free'd at exit.
+ */
+static char** new_environ;
 
 /*
  * Call this method early, before any code has used the original argv passed in
@@ -145,7 +150,6 @@ char** save_ps_args(int argc, char** argv)
     {
         char* end_of_area = NULL;
         int non_contiguous_area = 0;
-        char** new_environ;
         int i;
 
         /*
@@ -405,9 +409,9 @@ void cleanup_ps_args(char **argv)
 #ifdef PS_USE_CLOBBER_ARGV
         {
             int i;
-            for (i = 0; environ[i] != NULL; i++)
-                free(environ[i]);
-            free(environ);
+            for (i = 0; new_environ[i] != NULL; i++)
+                free(new_environ[i]);
+            free(new_environ);
         }
 #endif /* PS_USE_CLOBBER_ARGV */
 

Original file line number	Diff line number	Diff line change
`@@ -1402,7 +1402,7 @@ int main(int argc, char *argv[])`
`1402`	`1402`	`* Do not move this de-initialization. It needs to happen right before`
`1403`	`1403`	`* exiting.`
`1404`	`1404`	`*/`
`1405`		`- cleanup_ps_args(argv);`
	`1405`	`+ cleanup_ps_args(argv);`
`1406`	`1406`	`exit(exit_status);`
`1407`	`1407`	`}`
`1408`	`1408`	`/* }}} */`