cvs: php4 /ext/pcntl pcntl.c
| From: | Jason Greene | Date: | Mon, 06 May 2002 23:01:47 +0000 |
| Subject: | cvs: php4 /ext/pcntl pcntl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11732@lists.php.net to get a copy of this message | ||
jason Mon May 6 19:01:47 2002 EDT
Modified files:
/php4/ext/pcntl pcntl.c
Log:
Fix invalid warning caused by bogus convert_to_* calls
Fix possible invalid data in status for pcntl_waitpid()
Index: php4/ext/pcntl/pcntl.c
diff -u php4/ext/pcntl/pcntl.c:1.25 php4/ext/pcntl/pcntl.c:1.26
--- php4/ext/pcntl/pcntl.c:1.25 Mon May 6 15:48:39 2002
+++ php4/ext/pcntl/pcntl.c Mon May 6 19:01:46 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcntl.c,v 1.25 2002/05/06 19:48:39 jason Exp $ */
+/* $Id: pcntl.c,v 1.26 2002/05/06 23:01:46 jason Exp $ */
#define PCNTL_DEBUG 0
@@ -227,6 +227,8 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz|l", &pid, &z_status,
&options) == FAILURE)
return;
+
+ convert_to_long_ex(&z_status);
status = Z_LVAL_P(z_status);
@@ -622,8 +624,7 @@
if (zend_hash_index_find(&PCNTL_G(php_signal_table), *signal_num, (void *)
&func_name)==FAILURE) {
continue;
}
- convert_to_long_ex(¶m);
- convert_to_string_ex(&call_name);
+
ZVAL_LONG(param, *signal_num);
ZVAL_STRING(call_name, func_name, 0);