ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Properly handle request aborted inside OnStartRequest.

This commit is contained in:
Jacek Caban 2015-08-14 17:25:07 +02:00 committed by Alexandre Julliard
parent 5d52373c62
commit ce83ff7351
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/mshtml/navigate.c
View File

@ -939,6 +939,8 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This)
} }
if(This->is_doc_channel) { if(This->is_doc_channel) {
if(!This->bsc.window)
return E_ABORT; /* Binding aborted in OnStartRequest call. */
update_window_doc(This->bsc.window); update_window_doc(This->bsc.window);
if(This->bsc.window->base.outer_window->readystate != READYSTATE_LOADING) if(This->bsc.window->base.outer_window->readystate != READYSTATE_LOADING)
set_ready_state(This->bsc.window->base.outer_window, 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; return E_OUTOFMEMORY;
} }
on_start_nsrequest(This); hres = on_start_nsrequest(This);
if(FAILED(hres))
return hres;
} }
nsres = nsIStreamListener_OnDataAvailable(This->nslistener, nsres = nsIStreamListener_OnDataAvailable(This->nslistener,