From 41dd5296b3ab3ae4a570212cacdc9e3258b135c4 Mon Sep 17 00:00:00 2001 From: Kuba Brecka Date: Tue, 12 Apr 2016 15:18:11 +0000 Subject: [PATCH] [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 llvm-svn: 266080 --- compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc b/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc index 9f92d5e..30e5b4b 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc @@ -320,6 +320,8 @@ TSAN_INTERCEPTOR(void, dispatch_group_notify_f, dispatch_group_t group, 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_set_event_handler, 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_set_event_handler_f, 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_set_cancel_handler_f, 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_set_registration_handler, 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_set_registration_handler_f, 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)); }; -- 2.7.4