mshtml: Correctly handle NULL active element in IHTMLDocument2::get_activeElement.

5135144d · Jacek Caban · Alexandre Julliard · 0d011097 · 5135144d
Commit 5135144d authored Dec 24, 2014 by Jacek Caban Committed by Alexandre Julliard Dec 24, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

htmldoc.c dlls/mshtml/htmldoc.c +5 -0

No files found.
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -282,6 +282,11 @@ static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTM
        return E_FAIL;
    }

+    if(!nselem) {
+        *p = NULL;
+        return S_OK;
+    }
+
    hres = get_elem(This->doc_node, nselem, &elem);
    nsIDOMElement_Release(nselem);
    if(FAILED(hres))