mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: crash when resolving proxy due to network service restart (#42878)

Browse source
This commit is contained in:
Robo 2024-07-15 17:46:24 +09:00 • committed by GitHub
parent bbd7f4a5ad
commit 1e1dc22e16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
shell/browser/net/resolve_proxy_helper.cc
View file

@ -8,17 +8,20 @@
#include "base/functional/bind.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/storage_partition.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "net/base/network_anonymization_key.h"
#include "net/proxy_resolution/proxy_info.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "shell/browser/electron_browser_context.h"
#include "shell/browser/net/system_network_context_manager.h"
using content::BrowserThread;
namespace electron {
ResolveProxyHelper::ResolveProxyHelper(
network::mojom::NetworkContext* network_context)
: network_context_(network_context) {}
ResolveProxyHelper::ResolveProxyHelper(ElectronBrowserContext* browser_context)
: browser_context_(browser_context) {}
ResolveProxyHelper::~ResolveProxyHelper() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@ -52,9 +55,18 @@ void ResolveProxyHelper::StartPendingRequest() {
receiver_.set_disconnect_handler(
base::BindOnce(&ResolveProxyHelper::OnProxyLookupComplete,
base::Unretained(this), net::ERR_ABORTED, std::nullopt));
network_context_->LookUpProxyForURL(pending_requests_.front().url,
net::NetworkAnonymizationKey(),
std::move(proxy_lookup_client));
network::mojom::NetworkContext* network_context = nullptr;
if (browser_context_) {
network_context =
browser_context_->GetDefaultStoragePartition()->GetNetworkContext();
} else {
DCHECK(SystemNetworkContextManager::GetInstance());
network_context = SystemNetworkContextManager::GetInstance()->GetContext();
}
CHECK(network_context);
network_context->LookUpProxyForURL(pending_requests_.front().url,
net::NetworkAnonymizationKey(),
std::move(proxy_lookup_client));
}
void ResolveProxyHelper::OnProxyLookupComplete(