- all: fixed object interfaces queries and other fixes as reported by Jacob Lewallen

[vlc] / activex / objectsafety.h

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