From b024cd6de26174fd379efb769906b08c9d12f629 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 7 Apr 2008 13:05:56 +0200 Subject: [PATCH] mshtml: Don't crash if nsWebBrowser could not be created. --- dlls/mshtml/nsembed.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5d9b2478010..e46b8fa05ec 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1602,15 +1602,18 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) ret->editor = NULL; ret->reset_focus = NULL; + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_WEBBROWSER_CONTRACTID, + NULL, &IID_nsIWebBrowser, (void**)&ret->webbrowser); + if(NS_FAILED(nsres)) { + ERR("Creating WebBrowser failed: %08x\n", nsres); + heap_free(ret); + return NULL; + } + if(parent) nsIWebBrowserChrome_AddRef(NSWBCHROME(parent)); ret->parent = parent; - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_WEBBROWSER_CONTRACTID, - NULL, &IID_nsIWebBrowser, (void**)&ret->webbrowser); - if(NS_FAILED(nsres)) - ERR("Creating WebBrowser failed: %08x\n", nsres); - nsres = nsIWebBrowser_SetContainerWindow(ret->webbrowser, NSWBCHROME(ret)); if(NS_FAILED(nsres)) ERR("SetContainerWindow failed: %08x\n", nsres);