Also control plugin export table

[vlc] / activex / persistpropbag.h

diff --git a/activex/persistpropbag.h b/activex/persistpropbag.h
index df148b3b7f56e3fbe587c6cf3376795c29c4af71..f4e081c65ed61623744103fc66924255db515b4f 100644 (file)
--- a/activex/persistpropbag.h
+++ b/activex/persistpropbag.h
@@ -36,10 +36,12 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IPersist == riid) 
-         && (IID_IPersistPropertyBag == riid) ) {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IPersist == riid) 
+         || (IID_IPersistPropertyBag == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;