Jacek Caban : mshtml: Don' t crash in on_start_uri_open on nscontainer without associated document.
Alexandre Julliard
julliard at winehq.org
Mon Jun 14 13:01:17 CDT 2010
Module: wine
Branch: master
Commit: 95d98bdb537adb13d931c5104d1afe7da8e4ff7a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d98bdb537adb13d931c5104d1afe7da8e4ff7a
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Jun 14 02:19:12 2010 +0200
mshtml: Don't crash in on_start_uri_open on nscontainer without associated document.
---
dlls/mshtml/nsio.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 63c9a6a..d9e822d 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -222,13 +222,15 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retva
}
if(!wine_uri->is_doc_uri) {
+ wine_uri->is_doc_uri = TRUE;
+
if(!wine_uri->container) {
nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer));
wine_uri->container = nscontainer;
}
- wine_uri->is_doc_uri = TRUE;
- *_retval = translate_url(nscontainer->doc, wine_uri);
+ if(nscontainer->doc)
+ *_retval = translate_url(nscontainer->doc, wine_uri);
}
nsIURI_Release(NSURI(wine_uri));
More information about the wine-cvs
mailing list