Jacek Caban : mshtml: Properly handle request aborted inside OnStartRequest.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Aug 17 09:01:11 CDT 2015
Module: wine
Branch: master
Commit: ce83ff735129d28ac4ebb0099ccbf841cc2cf7ff
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce83ff735129d28ac4ebb0099ccbf841cc2cf7ff
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Aug 14 17:25:07 2015 +0200
mshtml: Properly handle request aborted inside OnStartRequest.
---
dlls/mshtml/navigate.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index c22080d..b324160 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -939,6 +939,8 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This)
}
if(This->is_doc_channel) {
+ if(!This->bsc.window)
+ return E_ABORT; /* Binding aborted in OnStartRequest call. */
update_window_doc(This->bsc.window);
if(This->bsc.window->base.outer_window->readystate != READYSTATE_LOADING)
set_ready_state(This->bsc.window->base.outer_window, READYSTATE_LOADING);
@@ -1053,7 +1055,9 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream)
return E_OUTOFMEMORY;
}
- on_start_nsrequest(This);
+ hres = on_start_nsrequest(This);
+ if(FAILED(hres))
+ return hres;
}
nsres = nsIStreamListener_OnDataAvailable(This->nslistener,
More information about the wine-cvs
mailing list