Rob Shearman : ole32: Fix potential NULL dereference of qiresults in ClientIdentity_QueryMultipleInterfaces .

Alexandre Julliard julliard at winehq.org
Wed Feb 13 10:40:10 CST 2008


Module: wine
Branch: master
Commit: 461ce6e4a28d1afb28a88861fa2143d0ac8919d0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=461ce6e4a28d1afb28a88861fa2143d0ac8919d0

Author: Rob Shearman <rob at codeweavers.com>
Date:   Wed Feb 13 12:35:13 2008 +0000

ole32: Fix potential NULL dereference of qiresults in ClientIdentity_QueryMultipleInterfaces.

This could happen if proxy_manager_get_remunknown returns S_FALSE, so 
fix the check of the return code to match that below.

---

 dlls/ole32/marshal.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index 32dadb1..dd292be 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -279,7 +279,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL
         /* get IRemUnknown proxy so we can communicate with the remote object */
         hr = proxy_manager_get_remunknown(This, &remunk);
 
-        if (hr == S_OK)
+        if (SUCCEEDED(hr))
         {
             hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS,
                                                nonlocal_mqis, iids, &qiresults);




More information about the wine-cvs mailing list