]> granicus.if.org Git - php/commitdiff
Fix invalid warning caused by bogus convert_to_* calls
authorJason Greene <jason@php.net>
Mon, 6 May 2002 23:01:46 +0000 (23:01 +0000)
committerJason Greene <jason@php.net>
Mon, 6 May 2002 23:01:46 +0000 (23:01 +0000)
Fix possible invalid data in status for pcntl_waitpid()

ext/pcntl/pcntl.c

index 4fdbd1f15c0a74c165b88a3214f37ea80545acfe..8f48cbb578e7e0f67e3dd8aff0273b110e7a0390 100755 (executable)
@@ -227,6 +227,8 @@ PHP_FUNCTION(pcntl_waitpid)
 
        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 @@ void pcntl_zend_extension_statement_handler(zend_op_array *op_array)
                if (zend_hash_index_find(&PCNTL_G(php_signal_table), *signal_num, (void *) &func_name)==FAILURE) {
                        continue;
                }
-               convert_to_long_ex(&param);
-               convert_to_string_ex(&call_name);
+
                ZVAL_LONG(param, *signal_num);
                ZVAL_STRING(call_name, func_name, 0);