bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix crash when closing a browser with pending requests (see issue #2622). 

This change fixes an issue where the cancel_callback for a pending request
might already have been executed when the OnBrowserDestroyed notification is
received.
This commit is contained in:
Marshall Greenblatt 2019-05-29 09:41:05 -07:00
parent 241941a44a
commit 2814054863
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libcef/browser/net_service/resource_request_handler_wrapper.cc
View File

@ -479,7 +479,9 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
if (!allow) {
// Cancel the request.
std::move(state->cancel_callback_).Run(net::ERR_ABORTED);
if (state->cancel_callback_) {
std::move(state->cancel_callback_).Run(net::ERR_ABORTED);
}
return;
}
@ -748,7 +750,9 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
return;
}
std::move(state->cancel_callback_).Run(net::ERR_CONTENT_DECODING_FAILED);
if (state->cancel_callback_) {
std::move(state->cancel_callback_).Run(net::ERR_CONTENT_DECODING_FAILED);
}
}
void OnRequestComplete(
@ -758,7 +762,10 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
CEF_REQUIRE_IOT();
RequestState* state = GetState(id);
DCHECK(state);
if (!state) {
// The request may have been canceled.
return;
}
// Redirection of standard custom schemes is handled with a restart, so we
// get completion notifications for both the original (redirected) request
@ -889,9 +896,14 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler {
// Cancel any pending requests.
while (!request_map_.empty()) {
// Results in a call to RemoveState().
std::move(request_map_.begin()->second->cancel_callback_)
.Run(net::ERR_ABORTED);
auto cancel_callback =
std::move(request_map_.begin()->second->cancel_callback_);
if (cancel_callback) {
// Results in a call to RemoveState().
std::move(cancel_callback).Run(net::ERR_ABORTED);
} else {
RemoveState(request_map_.begin()->first);
}
}
}