[compiler-rt] r190682 - [msan] Intercept tzset.

[Evgeniy Stepanov]

Author: eugenis
Date: Fri Sep 13 06:27:38 2013
New Revision: 190682

URL: http://llvm.org/viewvc/llvm-project?rev=190682&view=rev
Log:
[msan] Intercept tzset.

Added:
    compiler-rt/trunk/lib/msan/lit_tests/tzset.cc   (with props)
Modified:
    compiler-rt/trunk/lib/msan/msan_interceptors.cc

Added: compiler-rt/trunk/lib/msan/lit_tests/tzset.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/lit_tests/tzset.cc?rev=190682&view=auto
==============================================================================
--- compiler-rt/trunk/lib/msan/lit_tests/tzset.cc (added)
+++ compiler-rt/trunk/lib/msan/lit_tests/tzset.cc Fri Sep 13 06:27:38 2013
@@ -0,0 +1,16 @@
+// RUN: %clangxx_msan -m64 -O0 %s -o %t && %t
+
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+extern char *tzname[2];
+
+int main(void) {
+  if (!strlen(tzname[0]) || !strlen(tzname[1]))
+    exit(1);
+  tzset();
+  if (!strlen(tzname[0]) || !strlen(tzname[1]))
+    exit(1);
+  return 0;
+}

Propchange: compiler-rt/trunk/lib/msan/lit_tests/tzset.cc
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: compiler-rt/trunk/lib/msan/msan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_interceptors.cc?rev=190682&r1=190681&r2=190682&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/msan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/msan/msan_interceptors.cc Fri Sep 13 06:27:38 2013
@@ -1071,6 +1071,18 @@ INTERCEPTOR(int, pthread_join, void *th,
   return res;
 }
 
+extern char *tzname[2];
+
+INTERCEPTOR(void, tzset) {
+  ENSURE_MSAN_INITED();
+  REAL(tzset)();
+  if (tzname[0])
+    __msan_unpoison(tzname[0], REAL(strlen)(tzname[0]) + 1);
+  if (tzname[1])
+    __msan_unpoison(tzname[1], REAL(strlen)(tzname[1]) + 1);
+  return;
+}
+
 struct MSanInterceptorContext {
   bool in_interceptor_scope;
 };
@@ -1323,6 +1335,7 @@ void InitializeInterceptors() {
   INTERCEPT_FUNCTION(pthread_create);
   INTERCEPT_FUNCTION(pthread_key_create);
   INTERCEPT_FUNCTION(pthread_join);
+  INTERCEPT_FUNCTION(tzset);
   inited = 1;
 }
 }  // namespace __msan