mshtml: Return failure in IHTMLDocument2::documentElement for detached documents.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Return failure in IHTMLDocument2::documentElement for detached documents.
cb14ca2a · Gabriel Ivăncescu · Alexandre Julliard · 1f051768 · cb14ca2a · cb14ca2a
Commit cb14ca2a authored Dec 05, 2023 by Gabriel Ivăncescu Committed by Alexandre Julliard Dec 06, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

htmldoc.c dlls/mshtml/htmldoc.c +7 -3

navigation.js dlls/mshtml/tests/navigation.js +1 -0

No files found.
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -2364,9 +2364,13 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I

    TRACE("(%p)->(%p)\n", This, p);

-    if(This->outer_window && This->outer_window->readystate == READYSTATE_UNINITIALIZED) {
-        *p = NULL;
-        return S_OK;
+    if(This->window) {
+        if(!This->window->base.outer_window)
+            return E_FAIL;
+        if(This->window->base.outer_window->readystate == READYSTATE_UNINITIALIZED) {
+            *p = NULL;
+            return S_OK;
+        }
    }

    if(!This->dom_document) {

--- a/dlls/mshtml/tests/navigation.js
+++ b/dlls/mshtml/tests/navigation.js
@@ -121,6 +121,7 @@ function detached_iframe_doc() {
            expect_exception(function() { origDoc.toString(); }, true);
            expect_exception(function() { origDoc.cookie; });
            expect_exception(function() { origDoc.cookie = "test=val"; });
+            expect_exception(function() { origDoc.documentElement; });
            expect_exception(function() { origDoc.domain; });
            expect_exception(function() { origDoc.frames; });
            expect_exception(function() { origDoc.readyState; }, true);