[compiler-rt] r180703 - asna/tsan/msan: fix wait() interceptors to allow NULL arguments

[Dmitry Vyukov]

Author: dvyukov
Date: Mon Apr 29 04:04:24 2013
New Revision: 180703

URL: http://llvm.org/viewvc/llvm-project?rev=180703&view=rev
Log:
asna/tsan/msan: fix wait() interceptors to allow NULL arguments

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=180703&r1=180702&r2=180703&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc Mon Apr 29 04:04:24 2013
@@ -644,7 +644,7 @@ INTERCEPTOR(int, wait, int *status) {
   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 @@ INTERCEPTOR(int, waitid, int idtype, int
   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 @@ INTERCEPTOR(int, waitpid, int pid, int *
   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 @@ INTERCEPTOR(int, wait3, int *status, int
   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 @@ INTERCEPTOR(int, wait4, int pid, int *st
   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);
   }