From 8cd2bb3d49ace91dcc666268a55834699be12fbf Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 23 Sep 2024 18:56:28 +0000 Subject: [PATCH] fix: Expand undefined vars to empty string Bugs (fixed): * Md shared memory file names have unexpanded variable: '${BTS_SHARED_MEMORY_PREFIX}' --- src/lib_spark/spark/md/ShmSegmentName.cpp | 2 +- src/lib_system/system/os.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_spark/spark/md/ShmSegmentName.cpp b/src/lib_spark/spark/md/ShmSegmentName.cpp index 17fd3fb7c..04a9f9527 100644 --- a/src/lib_spark/spark/md/ShmSegmentName.cpp +++ b/src/lib_spark/spark/md/ShmSegmentName.cpp @@ -15,7 +15,7 @@ std::string ShmSegmentName::prefix() { std::lock_guard lock{prefix_mx_}; // Verify it hasn't been initialized again (since the initial check was done without a lock). if (!prefix_initialized_) { - os::try_expand_env(SHARED_MEMORY_PREFIX, prefix_); + prefix_ = os::expand_env(SHARED_MEMORY_PREFIX, false); auto proc_name = os::process_path().filename().string(); if (prefix_.empty()) { prefix_ = std::move(proc_name); diff --git a/src/lib_system/system/os.cpp b/src/lib_system/system/os.cpp index 3808eb993..5a219a5ea 100644 --- a/src/lib_system/system/os.cpp +++ b/src/lib_system/system/os.cpp @@ -668,6 +668,7 @@ std::string expand_env(std::string name, bool assert_vars_exist) { bts_assert_msgf( !assert_vars_exist, "Environment variable '{}' is undefined", std::string{name}); + name.replace(from.first, from.second, ""); continue; } name.replace(from.first, from.second, var);