This commit is contained in:
foobar 2001-11-04 02:09:55 +00:00
parent 2c9ed05832
commit 488b76b95d

View file

@ -55,11 +55,11 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
void (*sig_handler)(); void (*sig_handler)();
#endif #endif
buf = (char*) emalloc(EXEC_INPUT_BUF); buf = (char *) emalloc(EXEC_INPUT_BUF);
if (!buf) { if (!buf) {
php_error(E_WARNING, "Unable to emalloc %d bytes for exec buffer", EXEC_INPUT_BUF); php_error(E_WARNING, "Unable to emalloc %d bytes for exec buffer", EXEC_INPUT_BUF);
return -1; return -1;
} }
buflen = EXEC_INPUT_BUF; buflen = EXEC_INPUT_BUF;
if (PG(safe_mode)) { if (PG(safe_mode)) {
@ -110,6 +110,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
#endif #endif
return -1; return -1;
} }
} else { /* not safe_mode */ } else { /* not safe_mode */
#if PHP_SIGCHILD #if PHP_SIGCHILD
sig_handler = signal (SIGCHLD, SIG_DFL); sig_handler = signal (SIGCHLD, SIG_DFL);