From: Harald Radi <phanto@php.net>
Date: Thu, 27 Mar 2003 19:56:59 +0000 (+0000)
Subject: MFB ext/com
X-Git-Tag: RELEASE_0_5~313
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f629da9384c717df45ed739eba85ea0e3978264e;p=php

MFB ext/com
fix #22899
invoke is called twice
---

diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 04e9a74f08..5892611485 100644
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -89,7 +89,7 @@ ZEND_API HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags,
 	if (C_HASTLIB(obj)) {
 		hr = C_TYPEINFO_VT(obj)->Invoke(C_TYPEINFO(obj), C_DISPATCH(obj),
 			dispIdMember, wFlags, pDispParams, pVarResult, &ExceptInfo, &ArgErr);
-		if (FAILED(hr)) {
+		if (FAILED(hr) && (hr != DISP_E_EXCEPTION)) {
 			hr = C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), dispIdMember, &IID_NULL,
 				LOCALE_SYSTEM_DEFAULT, wFlags, pDispParams, pVarResult, &ExceptInfo, &ArgErr);
 			if (SUCCEEDED(hr)) {