Commit 3f250a6e authored by Claude van der Merwe's avatar Claude van der Merwe Committed by Commit Bot

CrosNetworkConfig: Return early after failing to GetManagedProperties.

CrosNetworkConfig::OnGetManagedProperties was running OnceCallback
twice under certain circumstances (like forgetting a disconnected VPN
network), causing chrome to crash. Added a return statement after the
first time the OnceCallback is run.

Bug: 1111431
Change-Id: Ib901bed15c2ec0923915f0963cc27563fb3162e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2329924
Commit-Queue: Claude van der Merwe <cvandermerwe@google.com>
Reviewed-by: default avatarJon Mann <jonmann@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794640}
parent b8e0e444
...@@ -1888,6 +1888,7 @@ void CrosNetworkConfig::OnGetManagedProperties( ...@@ -1888,6 +1888,7 @@ void CrosNetworkConfig::OnGetManagedProperties(
NET_LOG(ERROR) << "GetManagedProperties failed for: " << guid NET_LOG(ERROR) << "GetManagedProperties failed for: " << guid
<< " Error: " << error.value_or("Failed"); << " Error: " << error.value_or("Failed");
std::move(callback).Run(nullptr); std::move(callback).Run(nullptr);
return;
} }
const NetworkState* network_state = const NetworkState* network_state =
network_state_handler_->GetNetworkState(service_path); network_state_handler_->GetNetworkState(service_path);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment