X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Fprovideclassinfo.h;h=82b43e7ab474498088ac2f04553f6dc1f44c0a88;hb=01b16b830c707aed4a1811adb05217417890c2d7;hp=9074fc4534e381d256dd430b2b14ca6b152fa77e;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc

diff --git a/activex/provideclassinfo.h b/activex/provideclassinfo.h
index 9074fc4534..82b43e7ab4 100644
--- a/activex/provideclassinfo.h
+++ b/activex/provideclassinfo.h
@@ -36,10 +36,12 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IProvideClassInfo == riid) 
-         && (IID_IProvideClassInfo2 == riid) ) {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IProvideClassInfo == riid) 
+         || (IID_IProvideClassInfo2 == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;