Add cleanup on an exec failure

Remove debug comments

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 8f7998c47853de8dfe89d3ca0906d8cb39fa1640..8663a539af34f24f87bdd78bc0e819a52b855e80 100755 (executable)
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -400,7 +400,6 @@ PHP_FUNCTION(pcntl_exec)
                        *current_arg=Z_STRVAL_PP(element);
                }
                *(current_arg)=NULL;
-               /* while(*argv != NULL) printf("Arg: %s\n",*argv++); */
        } else {
                argv=alloca(2 * sizeof(char *));
                *argv=path;
@@ -434,18 +433,23 @@ PHP_FUNCTION(pcntl_exec)
                        strlcat(*pair, Z_STRVAL_PP(element), pair_length);
                                                
                        /* Cleanup */
-                       if (return_val == HASH_KEY_IS_LONG) free_alloca(101);
+                       if (return_val == HASH_KEY_IS_LONG) free_alloca(key);
                }
                *(pair)=NULL;
-               /* while(*envp != NULL) printf("Env: %s\n",*envp++); */
        }
    
        if (execve(path, argv, envp) == -1) {
-               php_error(E_ERROR, "Error has occured in %s: (errno %d) %s", get_active_function_name(TSRMLS_CC),
+               php_error(E_WARNING, "Error has occured in %s: (errno %d) %s", get_active_function_name(TSRMLS_CC),
                        errno, strerror(errno));
  
        }
    
+       /* Cleanup */
+       for (pair=envp; *pair!=NULL; pair++) efree(*pair);
+   
+       free_alloca(argv);
+       free_alloca(envp);
+       
        RETURN_FALSE;
 }
 /* }}} */