Plus a leak when both register_globals and track_vars are off.

diff --git a/main/main.c b/main/main.c
index 2e15f8d0a3eb6f2a8f225da770a3b34a7d8b9aa2..2ad89b5bf80623f7d9f22c38b849f8e0cb9a95c3 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1075,6 +1075,9 @@ static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC)
        int count = 0;
        char *ss, *space;
 
+       if (!PG(register_globals) && !PG(track_vars))
+               return;
+       
        ALLOC_ZVAL(arr);
        array_init(arr);
        INIT_PZVAL(arr);