OS X 10.10: Fix incorrect check for presence of unsupported MACH_SEND_TRAILER in...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14890

diff --git a/NEWS b/NEWS
index 6d82de4bceb16f498a505c49622f2d276ec0ee55..c9f65bd624534b7bada0bf6934ee305af86d879c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -76,6 +76,7 @@ where XXXXXX is the bug number as listed below.
 342795  Internal glibc __GI_mempcpy call should be intercepted
 343012  Unhandled syscall 319 (memfd_create)
 343303  Fix known deliberate memory leak in setenv() on Mac OS X 10.10
+343306  OS X 10.10: UNKNOWN mach_msg unhandled MACH_SEND_TRAILER option (partial fix)
 n-i-bz  Provide implementations of certain compiler builtins to support
         compilers who may not provide those
 n-i-bz  Old STABS code is still being compiled, but never used. Remove it.

diff --git a/coregrind/m_syswrap/syswrap-darwin.c b/coregrind/m_syswrap/syswrap-darwin.c
index 25b5275ed9a9bdbd185de1798f231d38f90d3f47..2067d8dc44c032b231d2b658dab80b1952020f14 100644 (file)
--- a/coregrind/m_syswrap/syswrap-darwin.c
+++ b/coregrind/m_syswrap/syswrap-darwin.c
@@ -7903,7 +7903,9 @@ PRE(mach_msg)
       // (but is this only for too-secure processes?)
       // JRS 11 Nov 2014: this assertion is OK for <= 10.9 but fails on 10.10
 #     if DARWIN_VERS == DARWIN_10_10
-      log_decaying("UNKNOWN mach_msg unhandled MACH_SEND_TRAILER option");
+      if (mh->msgh_bits & MACH_SEND_TRAILER) {
+         log_decaying("UNKNOWN mach_msg unhandled MACH_SEND_TRAILER option");
+      }
 #     else
       vg_assert(! (mh->msgh_bits & MACH_SEND_TRAILER));
 #     endif