archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixes bugs #19156 and #19544

Browse source
This commit is contained in:
Harald Radi 2002-10-02 12:53:51 +00:00
parent 614d10a8cb
commit afb75a45e9
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ext/com/COM.c
View file

@ -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, 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))) { DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dispparams, var_result, NULL, NULL))) {
if (V_VT(var_result) == VT_UNKNOWN) { 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, C_HASENUM(obj) = SUCCEEDED(V_UNKNOWN(var_result)->lpVtbl->QueryInterface(V_UNKNOWN(var_result), &IID_IEnumVARIANT,
(void**)&C_ENUMVARIANT(obj))); (void**)&C_ENUMVARIANT(obj)));
} else if (V_VT(var_result) == VT_DISPATCH) { } 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, C_HASENUM(obj) = SUCCEEDED(V_DISPATCH(var_result)->lpVtbl->QueryInterface(V_DISPATCH(var_result), &IID_IEnumVARIANT,
(void**)&C_ENUMVARIANT(obj))); (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)) { switch (Z_TYPE_P(overloaded_property)) {
case OE_IS_ARRAY: case OE_IS_ARRAY:
if (do_COM_offget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) { if (do_COM_offget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) {
pval_destructor(&overloaded_property->element);
FREE_VARIANT(var_result); FREE_VARIANT(var_result);
FREE_COM(obj_prop); FREE_COM(obj_prop);
@ -1881,6 +1880,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
case OE_IS_OBJECT: case OE_IS_OBJECT:
if (do_COM_propget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) { if (do_COM_propget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) {
pval_destructor(&overloaded_property->element);
FREE_VARIANT(var_result); FREE_VARIANT(var_result);
FREE_COM(obj_prop); FREE_COM(obj_prop);
@ -1888,21 +1888,24 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
} }
break; break;
case OE_IS_METHOD: { case OE_IS_METHOD:
FREE_VARIANT(var_result); pval_destructor(&overloaded_property->element);
if (obj != obj_prop) { FREE_VARIANT(var_result);
FREE_COM(obj_prop);
return_value = *object; if (obj != obj_prop) {
ZVAL_ADDREF(&return_value); FREE_COM(obj_prop);
} else {
RETVAL_COM(obj); return_value = *object;
} ZVAL_ADDREF(&return_value);
return return_value; } else {
RETVAL_COM(obj);
} }
break;
return return_value;
} }
pval_destructor(&overloaded_property->element);
if (V_VT(var_result) == VT_DISPATCH) { if (V_VT(var_result) == VT_DISPATCH) {
if (V_DISPATCH(var_result) == NULL) { if (V_DISPATCH(var_result) == NULL) {
FREE_VARIANT(var_result); FREE_VARIANT(var_result);
@ -1920,8 +1923,6 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
FREE_COM(obj_prop); FREE_COM(obj_prop);
obj_prop = NULL; obj_prop = NULL;
} }
pval_destructor(&overloaded_property->element);
} }
if (obj_prop != NULL) { if (obj_prop != NULL) {