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).

ole32: Fix DefaultHandler_EnumAdvises.
582e2f1f · Robert Shearman · Alexandre Julliard · cca69647 · 582e2f1f
Commit 582e2f1f authored Apr 07, 2006 by Robert Shearman Committed by Alexandre Julliard Apr 07, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

defaulthandler.c dlls/ole32/defaulthandler.c +2 -3

No files found.
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -838,10 +838,9 @@ static HRESULT WINAPI DefaultHandler_EnumAdvise(
  *ppenumAdvise = NULL;

  if (!This->oleAdviseHolder)
-    return IOleAdviseHolder_EnumAdvise(This->oleAdviseHolder,
-				       ppenumAdvise);
+      return S_OK;

-  return S_OK;
+  return IOleAdviseHolder_EnumAdvise(This->oleAdviseHolder, ppenumAdvise);
 }

 /************************************************************************