mshtml: Correctly handle NULL nsdoc in IHTMLDocument2::get_body.
This commit is contained in:
parent
22ba44b401
commit
c481fb4bb8
|
@ -140,19 +140,17 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement
|
|||
HTMLDocument *This = HTMLDOC_THIS(iface);
|
||||
nsIDOMHTMLElement *nsbody = NULL;
|
||||
HTMLDOMNode *node;
|
||||
nsresult nsres;
|
||||
|
||||
TRACE("(%p)->(%p)\n", This, p);
|
||||
|
||||
if(!This->doc_node->nsdoc) {
|
||||
WARN("NULL nsdoc\n");
|
||||
return E_UNEXPECTED;
|
||||
}
|
||||
if(This->doc_node->nsdoc) {
|
||||
nsresult nsres;
|
||||
|
||||
nsres = nsIDOMHTMLDocument_GetBody(This->doc_node->nsdoc, &nsbody);
|
||||
if(NS_FAILED(nsres)) {
|
||||
TRACE("Could not get body: %08x\n", nsres);
|
||||
return E_UNEXPECTED;
|
||||
nsres = nsIDOMHTMLDocument_GetBody(This->doc_node->nsdoc, &nsbody);
|
||||
if(NS_FAILED(nsres)) {
|
||||
TRACE("Could not get body: %08x\n", nsres);
|
||||
return E_UNEXPECTED;
|
||||
}
|
||||
}
|
||||
|
||||
if(nsbody) {
|
||||
|
|
|
@ -6972,7 +6972,7 @@ static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc)
|
|||
|
||||
static void test_docfrag(IHTMLDocument2 *doc)
|
||||
{
|
||||
IHTMLElement *div, *br;
|
||||
IHTMLElement *div, *body, *br;
|
||||
IHTMLElementCollection *col;
|
||||
IHTMLDocument2 *frag;
|
||||
HRESULT hres;
|
||||
|
@ -6990,6 +6990,11 @@ static void test_docfrag(IHTMLDocument2 *doc)
|
|||
|
||||
test_disp((IUnknown*)frag, &DIID_DispHTMLDocument, "[object]");
|
||||
|
||||
body = (void*)0xdeadbeef;
|
||||
hres = IHTMLDocument2_get_body(frag, &body);
|
||||
ok(hres == S_OK, "get_body failed: %08x\n", hres);
|
||||
ok(!body, "body != NULL\n");
|
||||
|
||||
br = test_create_elem(doc, "BR");
|
||||
test_node_append_child((IUnknown*)frag, (IUnknown*)br);
|
||||
IHTMLElement_Release(br);
|
||||
|
|
Loading…
Reference in New Issue