1 files changed, 7 insertions, 10 deletions
diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc
index 4925619ec..546ffa719 100644
--- a/lib/msan/msan.cc
+++ b/lib/msan/msan.cc
@@ -144,17 +144,14 @@ static void ParseFlagsFromString(Flags *f, const char *str) {
 }
 
 static void InitializeFlags(Flags *f, const char *options) {
+  CommonFlags *cf = common_flags();
   SetCommonFlagsDefaults();
-  {
-    CommonFlags cf = *common_flags();
-    cf.external_symbolizer_path = GetEnv("MSAN_SYMBOLIZER_PATH");
-    cf.malloc_context_size = 20;
-    cf.handle_ioctl = true;
-    // FIXME: test and enable.
-    cf.check_printf = false;
-    cf.intercept_tls_get_addr = true;
-    OverrideCommonFlags(cf);
-  }
+  cf->external_symbolizer_path = GetEnv("MSAN_SYMBOLIZER_PATH");
+  cf->malloc_context_size = 20;
+  cf->handle_ioctl = true;
+  // FIXME: test and enable.
+  cf->check_printf = false;
+  cf->intercept_tls_get_addr = true;
 
   internal_memset(f, 0, sizeof(*f));
   f->poison_heap_with_zeroes = false;