Skip to content

Fix lambda captures and exception handling in HCS static initialization #13977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 2 commits into from
Closed

Fix lambda captures and exception handling in HCS static initialization #13977

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64acf34
Initial plan
Copilot Dec 24, 2025
44e95aa
Fix lambda capture lists and improve exception handling in HCS functions
Copilot Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/windows/common/hcs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ wsl::windows::common::hcs::unique_hcs_system wsl::windows::common::hcs::CreateCo

std::vector<std::string> wsl::windows::common::hcs::GetProcessorFeatures()
{
static std::vector<std::string> g_processorFeatures;
static std::optional<std::vector<std::string>> g_processorFeatures;
static std::once_flag flag;
std::call_once(flag, [&]() {
std::call_once(flag, []() {
ExecutionContext context(Context::HCS);

wil::unique_cotaskmem_string result;
Expand All @@ -120,7 +120,9 @@ std::vector<std::string> wsl::windows::common::hcs::GetProcessorFeatures()
g_processorFeatures = std::move(response.Response.ProcessorFeatures);
});

return g_processorFeatures;
// If we reach here after call_once, initialization succeeded. The optional will be set.
// If call_once threw, we never reach this line.
return g_processorFeatures.value();
}

wsl::shared::hns::HNSEndpoint wsl::windows::common::hcs::GetEndpointProperties(HCN_ENDPOINT Endpoint)
Expand Down Expand Up @@ -156,9 +158,9 @@ GUID wsl::windows::common::hcs::GetRuntimeId(_In_ HCS_SYSTEM ComputeSystem)

std::pair<uint32_t, uint32_t> wsl::windows::common::hcs::GetSchemaVersion()
{
static std::pair<uint32_t, uint32_t> g_schemaVersion{};
static std::optional<std::pair<uint32_t, uint32_t>> g_schemaVersion;
static std::once_flag flag;
std::call_once(flag, [&]() {
std::call_once(flag, []() {
ExecutionContext context(Context::HCS);

PropertyQuery query;
Expand Down Expand Up @@ -186,7 +188,9 @@ std::pair<uint32_t, uint32_t> wsl::windows::common::hcs::GetSchemaVersion()
g_schemaVersion = {majorVersion, minorVersion};
});

return g_schemaVersion;
// If we reach here after call_once, initialization succeeded. The optional will be set.
// If call_once threw, we never reach this line.
return g_schemaVersion.value();
}

void wsl::windows::common::hcs::GrantVmAccess(_In_ PCWSTR VmId, _In_ PCWSTR FilePath)
Expand Down