Also enable memory trapping with "true" environment variable value

2 files changed, 5 insertions, 5 deletions

diff --git a/vespalib/src/tests/util/memory_trap/memory_trap_test.cpp b/vespalib/src/tests/util/memory_trap/memory_trap_test.cpp
index ee26231c546..b06ae8f5585 100644
--- a/vespalib/src/tests/util/memory_trap/memory_trap_test.cpp
+++ b/vespalib/src/tests/util/memory_trap/memory_trap_test.cpp
@@ -15,7 +15,7 @@ void do_not_optimize_away(T&& t) noexcept {
 struct MemoryTrapTest : Test {
     static void SetUpTestSuite() {
         // Don't overwrite env var if already set; we'll assume it's done for a good reason.
-        setenv("VESPA_USE_MPROTECT_TRAP", "yes", 0);
+        setenv("VESPA_USE_MPROTECT_TRAP", "true", 0);
     }
 };
 
diff --git a/vespalib/src/vespa/vespalib/util/memory_trap.cpp b/vespalib/src/vespa/vespalib/util/memory_trap.cpp
index d3b666d9a6e..1403fc5d222 100644
--- a/vespalib/src/vespa/vespalib/util/memory_trap.cpp
+++ b/vespalib/src/vespa/vespalib/util/memory_trap.cpp
@@ -92,13 +92,13 @@ constexpr size_t align_down_4k(size_t v) noexcept {
     return v & ~4095ULL;
 }
 
-bool env_var_is_yes(const char *env_var) noexcept {
-    const char *ev = getenv(env_var);
-    return ((ev != nullptr) && ("yes"sv == ev));
+bool env_var_implies_enabled(const char* env_var) noexcept {
+    const char* ev = getenv(env_var);
+    return ((ev != nullptr) && (("true"sv == ev) || "yes"sv == ev));
 }
 
 bool mprotect_trapping_is_enabled() noexcept {
-    static const bool enabled = (has_4k_pages() && env_var_is_yes("VESPA_USE_MPROTECT_TRAP"));
+    static const bool enabled = (has_4k_pages() && env_var_implies_enabled("VESPA_USE_MPROTECT_TRAP"));
     return enabled;
 }