Andrew Eikum : mshtml: Don't crash creating a URI if we have no document.

Alexandre Julliard julliard at winehq.org
Mon Aug 22 10:24:12 CDT 2016


Module: wine
Branch: master
Commit: 22783dfef88acd506587ce183f8e9f791c31aa70
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=22783dfef88acd506587ce183f8e9f791c31aa70

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Fri Aug 19 08:27:20 2016 -0500

mshtml: Don't crash creating a URI if we have no document.

Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/nsio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 88164d0..0e2a748 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -3463,7 +3463,8 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, IUri *iuri, nsWineURI **ret)
     nsWineURI *uri;
     nsresult nsres;
 
-    nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, NULL, &uri);
+    nsres = create_nsuri(iuri, window, window->doc_obj ? window->doc_obj->nscontainer : NULL,
+            NULL, &uri);
     if(NS_FAILED(nsres))
         return E_FAIL;
 




More information about the wine-cvs mailing list