commit f82eb24b61f8c0f23396ed5ba68f5ace7656e986
author Dmitry Vyukov <dvyukov@google.com> Mon Apr 29 09:04:24 2013 +0000
committer Dmitry Vyukov <dvyukov@google.com> Mon Apr 29 09:04:24 2013 +0000
tree 7aab0e4078da720807245e29cfd88ce5ae5f44ec
parent 62db3f26edf6c17ab562c0480176341303a9463a

asna/tsan/msan: fix wait() interceptors to allow NULL arguments


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@180703 91177308-0d34-0410-b5e6-96231b3b80d8

lib/sanitizer_common/sanitizer_common_interceptors.inc

diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc
index a7c7de5..8023f29 100644
--- a/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -644,7 +644,7 @@
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, wait, status);
   int res = REAL(wait)(status);
-  if (res != -1)
+  if (res != -1 && status)
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, status, sizeof(*status));
   return res;
 }
@@ -652,7 +652,7 @@
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, waitid, idtype, id, infop, options);
   int res = REAL(waitid)(idtype, id, infop, options);
-  if (res != -1)
+  if (res != -1 && infop)
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, infop, siginfo_t_sz);
   return res;
 }
@@ -660,7 +660,7 @@
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, waitpid, pid, status, options);
   int res = REAL(waitpid)(pid, status, options);
-  if (res != -1)
+  if (res != -1 && status)
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, status, sizeof(*status));
   return res;
 }
@@ -669,7 +669,8 @@
   COMMON_INTERCEPTOR_ENTER(ctx, wait3, status, options, rusage);
   int res = REAL(wait3)(status, options, rusage);
   if (res != -1) {
-    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, status, sizeof(*status));
+    if (status)
+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, status, sizeof(*status));
     if (rusage)
       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, rusage, struct_rusage_sz);
   }
@@ -680,7 +681,8 @@
   COMMON_INTERCEPTOR_ENTER(ctx, wait4, pid, status, options, rusage);
   int res = REAL(wait4)(pid, status, options, rusage);
   if (res != -1) {
-    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, status, sizeof(*status));
+    if (status)
+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, status, sizeof(*status));
     if (rusage)
       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, rusage, struct_rusage_sz);
   }