diff options
| author | Harald Radi <phanto@php.net> | 2002-10-02 12:53:51 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2002-10-02 12:53:51 +0000 |
| commit | afb75a45e903121d2fb0b466c528ea00d808eef8 (patch) | |
| tree | 1b2d83183e93d2b99a94baf75909b2f8f397e514 | |
| parent | 614d10a8cbd009c3107c210f54645f78f58cfe1c (diff) | |
| download | php-git-afb75a45e903121d2fb0b466c528ea00d808eef8.tar.gz | |
fixes bugs #19156 and #19544
| -rw-r--r-- | ext/com/COM.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c index 384d3b5f2a..e846aee203 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -291,11 +291,9 @@ PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* ppDisp, int cleanup if (C_HASENUM(obj) = SUCCEEDED(C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), DISPID_NEWENUM, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dispparams, var_result, NULL, NULL))) { if (V_VT(var_result) == VT_UNKNOWN) { - V_UNKNOWN(var_result)->lpVtbl->AddRef(V_UNKNOWN(var_result)); C_HASENUM(obj) = SUCCEEDED(V_UNKNOWN(var_result)->lpVtbl->QueryInterface(V_UNKNOWN(var_result), &IID_IEnumVARIANT, (void**)&C_ENUMVARIANT(obj))); } else if (V_VT(var_result) == VT_DISPATCH) { - V_DISPATCH(var_result)->lpVtbl->AddRef(V_DISPATCH(var_result)); C_HASENUM(obj) = SUCCEEDED(V_DISPATCH(var_result)->lpVtbl->QueryInterface(V_DISPATCH(var_result), &IID_IEnumVARIANT, (void**)&C_ENUMVARIANT(obj))); } @@ -1872,6 +1870,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer switch (Z_TYPE_P(overloaded_property)) { case OE_IS_ARRAY: if (do_COM_offget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) { + pval_destructor(&overloaded_property->element); FREE_VARIANT(var_result); FREE_COM(obj_prop); @@ -1881,6 +1880,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer case OE_IS_OBJECT: if (do_COM_propget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) { + pval_destructor(&overloaded_property->element); FREE_VARIANT(var_result); FREE_COM(obj_prop); @@ -1888,21 +1888,24 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer } break; - case OE_IS_METHOD: { - FREE_VARIANT(var_result); - if (obj != obj_prop) { - FREE_COM(obj_prop); + case OE_IS_METHOD: + pval_destructor(&overloaded_property->element); + FREE_VARIANT(var_result); - return_value = *object; - ZVAL_ADDREF(&return_value); - } else { - RETVAL_COM(obj); - } - return return_value; + if (obj != obj_prop) { + FREE_COM(obj_prop); + + return_value = *object; + ZVAL_ADDREF(&return_value); + } else { + RETVAL_COM(obj); } - break; + + return return_value; } + pval_destructor(&overloaded_property->element); + if (V_VT(var_result) == VT_DISPATCH) { if (V_DISPATCH(var_result) == NULL) { FREE_VARIANT(var_result); @@ -1920,8 +1923,6 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer FREE_COM(obj_prop); obj_prop = NULL; } - - pval_destructor(&overloaded_property->element); } if (obj_prop != NULL) { |