diff options
| author | Harald Radi <phanto@php.net> | 2001-09-08 20:40:56 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2001-09-08 20:40:56 +0000 |
| commit | 9a6fe9631efa2022a4c20a00ae7e49561a8014bd (patch) | |
| tree | e9299baaf6f5328fd68a03958bd06084ca069878 /ext/com/COM.c | |
| parent | d4b86e1c5bac94815a09739b5c04dff69705b441 (diff) | |
| download | php-git-9a6fe9631efa2022a4c20a00ae7e49561a8014bd.tar.gz | |
com_*() functions returned an oo-resource instead of an resource id,
thus subsequent com_*() calls to com-returnvalues failed.
Diffstat (limited to 'ext/com/COM.c')
| -rw-r--r-- | ext/com/COM.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c index f82602fb12..fda0b948da 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -804,9 +804,8 @@ PHP_FUNCTION(com_invoke) RETURN_FALSE; } - php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC); + RETVAL_VARIANT(var_result); - FREE_VARIANT(var_result); efree(arguments); } /* }}} */ @@ -1049,9 +1048,7 @@ PHP_FUNCTION(com_propget) RETURN_FALSE; } - php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC); - - FREE_VARIANT(var_result); + RETVAL_VARIANT(var_result); } /* }}} */ @@ -1201,8 +1198,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer pval_destructor(&overloaded_property->element); } - if (obj_prop != NULL) - { + if (obj_prop != NULL) { RETVAL_COM(obj); } |