Fix screensaver deadlock if terminating as soon the interface is created - closes...

[vlc] / activex / olecontrol.h

diff --git a/activex/olecontrol.h b/activex/olecontrol.h
index f58464c307f7a0b9332df5544c54dfe3d38e6963..330a6af8a5a955ff325cd3f99cf81cdbbd59849b 100644 (file)
--- a/activex/olecontrol.h
+++ b/activex/olecontrol.h
@@ -36,9 +36,10 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid)
-         && (IID_IOleControl == riid) ) 
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IOleControl == riid) )
         {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);