[compiler-rt] r266080 - [tsan] Fix a crash with dispatch_source_set_cancel_handler(NULL) on OS X

[Kuba Brecka via llvm-commits]

Author: kuba.brecka
Date: Tue Apr 12 10:18:11 2016
New Revision: 266080

URL: http://llvm.org/viewvc/llvm-project?rev=266080&view=rev
Log:
[tsan] Fix a crash with dispatch_source_set_cancel_handler(NULL) on OS X

We need to handle the case when handler is NULL in dispatch_source_set_cancel_handler and similar interceptors.

Differential Revision: http://reviews.llvm.org/D18968


Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc?rev=266080&r1=266079&r2=266080&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc Tue Apr 12 10:18:11 2016
@@ -320,6 +320,8 @@ TSAN_INTERCEPTOR(void, dispatch_group_no
 TSAN_INTERCEPTOR(void, dispatch_source_set_event_handler,
                  dispatch_source_t source, dispatch_block_t handler) {
   SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_event_handler, source, handler);
+  if (handler == nullptr)
+    return REAL(dispatch_source_set_event_handler)(source, nullptr);
   dispatch_block_t new_handler = ^(void) {
     {
       SCOPED_INTERCEPTOR_RAW(dispatch_source_set_event_handler_callback);
@@ -334,6 +336,8 @@ TSAN_INTERCEPTOR(void, dispatch_source_s
 TSAN_INTERCEPTOR(void, dispatch_source_set_event_handler_f,
                  dispatch_source_t source, dispatch_function_t handler) {
   SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_event_handler_f, source, handler);
+  if (handler == nullptr)
+    return REAL(dispatch_source_set_event_handler)(source, nullptr);
   dispatch_block_t block = ^(void) {
     handler(dispatch_get_context(source));
   };
@@ -343,6 +347,8 @@ TSAN_INTERCEPTOR(void, dispatch_source_s
 TSAN_INTERCEPTOR(void, dispatch_source_set_cancel_handler,
                  dispatch_source_t source, dispatch_block_t handler) {
   SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_cancel_handler, source, handler);
+  if (handler == nullptr)
+    return REAL(dispatch_source_set_cancel_handler)(source, nullptr);
   dispatch_block_t new_handler = ^(void) {
     {
       SCOPED_INTERCEPTOR_RAW(dispatch_source_set_cancel_handler_callback);
@@ -358,6 +364,8 @@ TSAN_INTERCEPTOR(void, dispatch_source_s
                  dispatch_source_t source, dispatch_function_t handler) {
   SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_cancel_handler_f, source,
                           handler);
+  if (handler == nullptr)
+    return REAL(dispatch_source_set_cancel_handler)(source, nullptr);
   dispatch_block_t block = ^(void) {
     handler(dispatch_get_context(source));
   };
@@ -368,6 +376,8 @@ TSAN_INTERCEPTOR(void, dispatch_source_s
                  dispatch_source_t source, dispatch_block_t handler) {
   SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_registration_handler, source,
                           handler);
+  if (handler == nullptr)
+    return REAL(dispatch_source_set_registration_handler)(source, nullptr);
   dispatch_block_t new_handler = ^(void) {
     {
       SCOPED_INTERCEPTOR_RAW(dispatch_source_set_registration_handler_callback);
@@ -383,6 +393,8 @@ TSAN_INTERCEPTOR(void, dispatch_source_s
                  dispatch_source_t source, dispatch_function_t handler) {
   SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_registration_handler_f, source,
                           handler);
+  if (handler == nullptr)
+    return REAL(dispatch_source_set_registration_handler)(source, nullptr);
   dispatch_block_t block = ^(void) {
     handler(dispatch_get_context(source));
   };