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

Fix assertions when shutting down with pending requests (see issue #2622). 

This change avoids the starting of new requests during shutdown.
This commit is contained in:
Marshall Greenblatt 2019-05-29 20:01:08 +03:00
parent 2814054863
commit fd80e5c653
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcef/browser/net_service/proxy_url_loader_factory.cc
View File

@ -5,6 +5,7 @@
#include "libcef/browser/net_service/proxy_url_loader_factory.h"
#include "libcef/browser/context.h"
#include "libcef/browser/thread_util.h"
#include "libcef/common/net_service/net_service_util.h"
@ -1107,6 +1108,12 @@ void ProxyURLLoaderFactory::CreateLoaderAndStart(
network::mojom::URLLoaderClientPtr client,
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
CEF_REQUIRE_IOT();
if (!CONTEXT_STATE_VALID()) {
// Don't start a request while we're shutting down.
return;
}
bool pass_through = false;
if (pass_through) {
// This is the so-called pass-through, no-op option.
@ -1138,8 +1145,8 @@ void ProxyURLLoaderFactory::OnLoaderCreated(
network::mojom::TrustedHeaderClientRequest request) {
CEF_REQUIRE_IOT();
auto request_it = requests_.find(request_id);
DCHECK(request_it != requests_.end());
request_it->second->OnLoaderCreated(std::move(request));
if (request_it != requests_.end())
request_it->second->OnLoaderCreated(std::move(request));
}
void ProxyURLLoaderFactory::OnTargetFactoryError() {