|
From: <sv...@va...> - 2015-01-26 09:00:55
|
Author: rhyskidd
Date: Mon Jan 26 09:00:51 2015
New Revision: 14890
Log:
OS X 10.10: Fix incorrect check for presence of unsupported MACH_SEND_TRAILER in mach_msg. Partial fix for BZ #343306.
Modified:
trunk/NEWS
trunk/coregrind/m_syswrap/syswrap-darwin.c
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Mon Jan 26 09:00:51 2015
@@ -76,6 +76,7 @@
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.
Modified: trunk/coregrind/m_syswrap/syswrap-darwin.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-darwin.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-darwin.c Mon Jan 26 09:00:51 2015
@@ -7903,7 +7903,9 @@
// (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
|