archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix #8992, patch by yasushi_takahashi@tsuken.co.jp

Browse source
This commit is contained in:
Stanislav Malyshev 2001-02-22 10:15:52 +00:00
parent 454221ba62
commit 4cda96691c
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/standard/exec.c
View file

@ -31,6 +31,9 @@
#if HAVE_SYS_WAIT_H #if HAVE_SYS_WAIT_H
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
#if HAVE_SIGNAL_H
#include <signal.h>
#endif
/* /*
* If type==0, only last line of output is returned (exec) * If type==0, only last line of output is returned (exec)
@ -48,6 +51,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
int overflow_limit, lcmd, ldir; int overflow_limit, lcmd, ldir;
int rsrc_id; int rsrc_id;
char *b, *c, *d=NULL; char *b, *c, *d=NULL;
void (*sig_handler)();
PLS_FETCH(); PLS_FETCH();
FLS_FETCH(); FLS_FETCH();
@ -89,6 +93,8 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
tmp = php_escape_shell_cmd(d); tmp = php_escape_shell_cmd(d);
efree(d); efree(d);
d = tmp; d = tmp;
sig_handler = signal (SIGCHLD, SIG_DFL);
#ifdef PHP_WIN32 #ifdef PHP_WIN32
fp = V_POPEN(d, "rb"); fp = V_POPEN(d, "rb");
#else #else
@ -98,9 +104,11 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
php_error(E_WARNING, "Unable to fork [%s]", d); php_error(E_WARNING, "Unable to fork [%s]", d);
efree(d); efree(d);
efree(buf); efree(buf);
signal (SIGCHLD, sig_handler);
return -1; return -1;
} }
} else { /* not safe_mode */ } else { /* not safe_mode */
sig_handler = signal (SIGCHLD, SIG_DFL);
#ifdef PHP_WIN32 #ifdef PHP_WIN32
fp = V_POPEN(cmd, "rb"); fp = V_POPEN(cmd, "rb");
#else #else
@ -109,6 +117,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
if (!fp) { if (!fp) {
php_error(E_WARNING, "Unable to fork [%s]", cmd); php_error(E_WARNING, "Unable to fork [%s]", cmd);
efree(buf); efree(buf);
signal (SIGCHLD, sig_handler);
return -1; return -1;
} }
} }
@ -137,6 +146,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
if ( buf == NULL ) { if ( buf == NULL ) {
php_error(E_WARNING, "Unable to erealloc %d bytes for exec buffer", php_error(E_WARNING, "Unable to erealloc %d bytes for exec buffer",
buflen + EXEC_INPUT_BUF); buflen + EXEC_INPUT_BUF);
signal (SIGCHLD, sig_handler);
return -1; return -1;
} }
buflen += EXEC_INPUT_BUF; buflen += EXEC_INPUT_BUF;
@ -203,6 +213,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value)
} }
#endif #endif
signal (SIGCHLD, sig_handler);
if (d) { if (d) {
efree(d); efree(d);
} }