mshtml: Abort on a cancelled async request properly.

Gecko can cancel an async request sometime between async_start_doc_binding registers it and on_start_nsrequest actually processes it. The latter should not attempt to continue in this case. Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml: Abort on a cancelled async request properly.
740d4ea1 · Gabriel Ivăncescu · Alexandre Julliard · 0fd3b8ad · 740d4ea1 · 740d4ea1
Commit 740d4ea1 authored May 26, 2022 by Gabriel Ivăncescu Committed by Alexandre Julliard May 27, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

binding.h dlls/mshtml/binding.h +1 -0

navigate.c dlls/mshtml/navigate.c +4 -0

nsio.c dlls/mshtml/nsio.c +3 -0

No files found.
--- a/dlls/mshtml/binding.h
+++ b/dlls/mshtml/binding.h
@@ -51,6 +51,7 @@ typedef struct {
    nsIURI *referrer;
    char *content_type;
    char *charset;
+    nsresult status;
    UINT32 response_status;
    char *response_status_text;
    REQUEST_METHOD request_method;

--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -981,6 +981,10 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This)
 {
    nsresult nsres;

+    /* Async request can be cancelled before we got to it */
+    if(NS_FAILED(This->nschannel->status))
+        return E_ABORT; /* FIXME: map status to HRESULT */
+
    This->nschannel->binding = This;

    /* FIXME: it's needed for http connections from BindToObject. */

--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -610,6 +610,9 @@ static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus)

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

+    if(NS_FAILED(aStatus))
+        This->status = aStatus;
+
    if(This->binding && This->binding->bsc.binding)
        IBinding_Abort(This->binding->bsc.binding);
    else