Make syzyasan_rtl compile in 64 bit

syzygy/agent/asan/unittest_util.cc

 // Copyright 2013 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 167 matching lines @@
   logger_stdout_file_.reset(base::OpenFile(
       temp_dir_.path().AppendASCII("agent_logger_stdout.txt"), "w"));
   CHECK(logger_stdout_file_);
   logger_stderr_file_.reset(base::OpenFile(
       temp_dir_.path().AppendASCII("agent_logger_stderr.txt"), "w"));
   CHECK(logger_stderr_file_);
 
   // Save the environment we found.
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   env->GetVar(kSyzygyRpcInstanceIdEnvVar, &old_logger_env_);
+  env->GetVar(common::kSyzyAsanOptionsEnvVar, &old_asan_options_env_);
 
   // Configure the environment (to pass the instance id to the agent DLL).
   // We append "-0" to the process id to avoid potential conflict with other
   // tests.
   instance_id_ = base::UintToString16(::GetCurrentProcessId()) + L"-0";
   AppendToLoggerEnv(base::StringPrintf("%ls,%ls",
                                        kSyzyAsanRtlDll,
                                        instance_id_.c_str()));
+  env->UnSetVar(common::kSyzyAsanOptionsEnvVar);
 
   log_contents_read_ = false;
   StartLogger();
 }
 
 void TestWithAsanLogger::TearDown() {
   StopLogger();
 
   // Restore the environment variable as we found it.
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   env->SetVar(kSyzygyRpcInstanceIdEnvVar, old_logger_env_);
+  env->SetVar(common::kSyzyAsanOptionsEnvVar, old_asan_options_env_);
 }
 
 bool TestWithAsanLogger::LogContains(const base::StringPiece& message) {
   if (!log_contents_read_ && logger_running_) {
     CHECK(base::ReadFileToString(log_file_path_, &log_contents_));
     log_contents_read_ = true;
   }
   return log_contents_.find(message.as_string()) != std::string::npos;
 }
 
@@ skipping 945 matching lines @@
 
   // Delete the entire range.
   shadow_address_space_.Remove(iter_pair);
   if (reinsert_head_range)
     CHECK(shadow_address_space_.Insert(head_range, head_data));
   if (reinsert_tail_range)
     CHECK(shadow_address_space_.Insert(tail_range, tail_data));
 }
 
 }  // namespace testing