From 3b5ed104bf358bb0ecd876e7f170f458ddc52249 Mon Sep 17 00:00:00 2001
From: Andrew Eikum <aeikum@codeweavers.com>
Date: Mon, 28 Sep 2009 13:31:08 -0500
Subject: [PATCH] mshtml: Check for null pointers in IHTMLLocation_get*.

---
 dlls/mshtml/htmllocation.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c
index 470d679c26a..67ebf99143c 100644
--- a/dlls/mshtml/htmllocation.c
+++ b/dlls/mshtml/htmllocation.c
@@ -168,6 +168,10 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p)
 {
     HTMLLocation *This = HTMLLOCATION_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
+
+    if(!p)
+        return E_POINTER;
+
     return E_NOTIMPL;
 }
 
@@ -182,6 +186,10 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p)
 {
     HTMLLocation *This = HTMLLOCATION_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
+
+    if(!p)
+        return E_POINTER;
+
     return E_NOTIMPL;
 }
 
@@ -196,6 +204,10 @@ static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p)
 {
     HTMLLocation *This = HTMLLOCATION_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
+
+    if(!p)
+        return E_POINTER;
+
     return E_NOTIMPL;
 }
 
@@ -210,6 +222,10 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p)
 {
     HTMLLocation *This = HTMLLOCATION_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
+
+    if(!p)
+        return E_POINTER;
+
     return E_NOTIMPL;
 }
 
@@ -231,6 +247,9 @@ static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p)
 
     TRACE("(%p)->(%p)\n", This, p);
 
+    if(!p)
+        return E_POINTER;
+
     hres = get_url(This, &doc_url);
     if(FAILED(hres))
         return hres;
@@ -271,6 +290,10 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p)
 {
     HTMLLocation *This = HTMLLOCATION_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
+
+    if(!p)
+        return E_POINTER;
+
     return E_NOTIMPL;
 }
 
@@ -285,6 +308,10 @@ static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p)
 {
     HTMLLocation *This = HTMLLOCATION_THIS(iface);
     FIXME("(%p)->(%p)\n", This, p);
+
+    if(!p)
+        return E_POINTER;
+
     return E_NOTIMPL;
 }
 
-- 
2.11.4.GIT