Robert Shearman : ole32: Fix DefaultHandler_EnumAdvises.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 582e2f1ff84f1069a10f031e53236285d4f6c310
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=582e2f1ff84f1069a10f031e...

Author: Robert Shearman <rob(a)codeweavers.com>
Date:   Fri Apr  7 11:18:05 2006 +0100

ole32: Fix DefaultHandler_EnumAdvises.

As per MSDN, if the object has no connections then
IOleObject::EnumAdvises should return a NULL enumerator and S_OK. This
is the case when This->oleAdviseHolder is NULL, so do this and avert a
potential NULL dereference of This->oleAdviseHolder (found by
Coverity).

---

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

diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index e2eaf58..e3a2e64 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -838,10 +838,9 @@ static HRESULT WINAPI DefaultHandler_Enu
   *ppenumAdvise = NULL;
 
   if (!This->oleAdviseHolder)
-    return IOleAdviseHolder_EnumAdvise(This->oleAdviseHolder,
-				       ppenumAdvise);
+      return S_OK;
 
-  return S_OK;
+  return IOleAdviseHolder_EnumAdvise(This->oleAdviseHolder, ppenumAdvise);
 }
 
 /************************************************************************