X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Foleinplaceactiveobject.h;h=159f3b13668990e4ce647e16348c57b3965d710a;hb=c03721fb71a2130478351a46abf54d733e75dc92;hp=1cae175651da40da71d1e6a285e3f0beb5456285;hpb=35db6dd6ecab2daf4c03ccc2c0be4b25a42c092c;p=vlc

diff --git a/activex/oleinplaceactiveobject.h b/activex/oleinplaceactiveobject.h
index 1cae175651..159f3b1366 100644
--- a/activex/oleinplaceactiveobject.h
+++ b/activex/oleinplaceactiveobject.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef __OLEINPLACEACTIVEOBJECT_H__
@@ -36,10 +36,11 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IOleWindow == riid) 
-         && (IID_IOleInPlaceActiveObject == riid) )
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid) 
+         || (IID_IOleWindow == riid) 
+         || (IID_IOleInPlaceActiveObject == riid) )
         {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);