[PATCH 0/1] MR6068: mshtml: Make sure we aren't detached before setting interactive ready state.

[Gabriel Ivăncescu]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6068

[PATCH 1/1] mshtml: Make sure we aren't detached before setting interactive ready state.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>

Once Human's EULA window uses InitNew during the parse_complete notifications,
causing the window to become detached from the outer window, and ending up
in a crash. But conceptually, even without the crash and somehow obtaining
the current outer window, it doesn't make sense to touch it if it changed.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
 dlls/mshtml/mutation.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c
index a502e3c9427..4e0276fd5f6 100644
--- a/dlls/mshtml/mutation.c
+++ b/dlls/mshtml/mutation.c
@@ -312,9 +312,9 @@ static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISuppo
 
     bind_event_scripts(This);
 
-    if(This->window == window) {
+    if(This->window == window && window->base.outer_window) {
         window->dom_interactive_time = get_time_stamp();
-        set_ready_state(This->window->base.outer_window, READYSTATE_INTERACTIVE);
+        set_ready_state(window->base.outer_window, READYSTATE_INTERACTIVE);
     }
     IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface);
     return NS_OK;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6068