cvs: php4 /ext/standard exec.c
| From: | Wez Furlong | Date: | Thu, 23 May 2002 10:17:08 +0000 |
| Subject: | cvs: php4 /ext/standard exec.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12059@lists.php.net to get a copy of this message | ||
wez Thu May 23 06:17:08 2002 EDT
Modified files:
/php4/ext/standard exec.c
Log:
Fix (stupid) segfault. #17379
Index: php4/ext/standard/exec.c
diff -u php4/ext/standard/exec.c:1.75 php4/ext/standard/exec.c:1.76
--- php4/ext/standard/exec.c:1.75 Thu May 23 03:52:03 2002
+++ php4/ext/standard/exec.c Thu May 23 06:17:07 2002
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.75 2002/05/23 07:52:03 derick Exp $ */
+/* $Id: exec.c,v 1.76 2002/05/23 10:17:07 wez Exp $ */
#include <stdio.h>
#include "php.h"
@@ -591,16 +591,16 @@
close a process opened by proc_open */
PHP_FUNCTION(proc_close)
{
- zval **proc;
+ zval *proc;
void *child;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &proc) == FAILURE) {
RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE(child, void *, proc, -1, "process", le_proc_open);
+ ZEND_FETCH_RESOURCE(child, void *, &proc, -1, "process", le_proc_open);
- zend_list_delete(Z_LVAL_PP(proc));
+ zend_list_delete(Z_LVAL_P(proc));
RETURN_LONG(FG(pclose_ret));
}
/* }}} */