mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add cleanup on an exec failure

Browse Source 
Remove debug comments
This commit is contained in:
Jason Greene 2001-10-03 03:48:27 +00:00
parent 4039c24ad5
commit dc7d5df048
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/pcntl/pcntl.c
View File

@ -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;
}
/* }}} */