]> granicus.if.org Git - php/commitdiff
MFB ext/com
authorHarald Radi <phanto@php.net>
Thu, 27 Mar 2003 19:56:59 +0000 (19:56 +0000)
committerHarald Radi <phanto@php.net>
Thu, 27 Mar 2003 19:56:59 +0000 (19:56 +0000)
fix #22899
invoke is called twice

ext/rpc/com/com_wrapper.c

index 04e9a74f084411789966ad330f86e16b733ad0dc..5892611485910cff12cef34fb183d63013dcf222 100644 (file)
@@ -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)) {