phanto Wed Oct 2 08:53:51 2002 EDT
Modified files:
/php4/ext/com COM.c
Log:
fixes bugs #19156 and #19544
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.86 php4/ext/com/COM.c:1.87
--- php4/ext/com/COM.c:1.86 Mon Aug 26 09:36:35 2002
+++ php4/ext/com/COM.c Wed Oct 2 08:53:51 2002
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: COM.c,v 1.86 2002/08/26 13:36:35 wez Exp $ */
+/* $Id: COM.c,v 1.87 2002/10/02 12:53:51 phanto Exp $ */
/*
* This module implements support for COM components that support the IDispatch
* interface. Both local (COM) and remote (DCOM) components can be accessed.
@@ -291,11 +291,9 @@
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 @@
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 @@
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 @@
}
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 @@
FREE_COM(obj_prop);
obj_prop = NULL;
}
-
- pval_destructor(&overloaded_property->element);
}
if (obj_prop != NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
