Add lock to prevent race on SysTimeFromTimeStruct

base/time/time_posix.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/time/time.h"
 
 #include <stdint.h>
 #include <sys/time.h>
 #include <time.h>
 #if defined(OS_ANDROID) && !defined(__LP64__)
 #include <time64.h>
 #endif
 #include <unistd.h>
 
 #include <limits>
 #include <ostream>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/port.h"
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID)
+#include "base/lazy_instance.h"
 #include "base/os_compat_android.h"
+#include "base/synchronization/lock.h"
 #elif defined(OS_NACL)
 #include "base/os_compat_nacl.h"
 #endif
 
 namespace {
 
+#if defined(OS_ANDROID)

[willchan no longer on Chromium, 2014/08/05 23:14:48]

No need for the OS_ANDROID stuff. This bug isn't Android specific, it applies to
all posix implementations doing an unsynchronized read/write on the TZ global
environment variable.

[bengr, 2014/08/05 23:54:58]

Done.

+// This prevents a crash on traversing the environment global and looking up
+// the 'TZ' variable in libc.
+base::LazyInstance<base::Lock>::Leaky
+  g_sys_time_to_time_struct_lock = LAZY_INSTANCE_INITIALIZER;
+#endif
+
 #if !defined(OS_MACOSX)
 // Define a system-specific SysTime that wraps either to a time_t or
 // a time64_t depending on the host system, and associated convertion.
 // See crbug.com/162007
 #if defined(OS_ANDROID) && !defined(__LP64__)
 typedef time64_t SysTime;
 
 SysTime SysTimeFromTimeStruct(struct tm* timestruct, bool is_local) {
+#if defined(OS_ANDROID)
+  base::AutoLock locked(g_sys_time_to_time_struct_lock.Get());
+#endif
   if (is_local)
     return mktime64(timestruct);
   else
     return timegm64(timestruct);
 }
 
 void SysTimeToTimeStruct(SysTime t, struct tm* timestruct, bool is_local) {
+#if defined(OS_ANDROID)
+  base::AutoLock locked(g_sys_time_to_time_struct_lock.Get());
+#endif
   if (is_local)
     localtime64_r(&t, timestruct);
   else
     gmtime64_r(&t, timestruct);
 }
 
 #else  // OS_ANDROID && !__LP64__
 typedef time_t SysTime;
 
 SysTime SysTimeFromTimeStruct(struct tm* timestruct, bool is_local) {
@@ skipping 321 matching lines @@
     result.tv_usec = static_cast<suseconds_t>(Time::kMicrosecondsPerSecond) - 1;
     return result;
   }
   int64 us = us_ - kTimeTToMicrosecondsOffset;
   result.tv_sec = us / Time::kMicrosecondsPerSecond;
   result.tv_usec = us % Time::kMicrosecondsPerSecond;
   return result;
 }
 
 }  // namespace base