diff options
| author | John Colanduoni <john@colanduoni.com> | 2017-11-08 02:28:17 -0800 |
|---|---|---|
| committer | John Colanduoni <john@colanduoni.com> | 2017-11-08 02:28:17 -0800 |
| commit | 8581b59fb39b0072665de59b1a70e708b251d4b0 (patch) | |
| tree | b7cb00943b224a1e64e464d03773a974418573f3 | |
| parent | e177df3d5c4a5a9432f33f54ee459ea25bf7f2d2 (diff) | |
| download | rust-8581b59fb39b0072665de59b1a70e708b251d4b0.tar.gz rust-8581b59fb39b0072665de59b1a70e708b251d4b0.zip | |
Disable `mmap` in `libbacktrace` on Apple platforms
Fixes #45731 libbacktrace uses mmap if available to map ranges of the files containing debug information. On macOS `mmap` will succeed even if the mapped range does not exist, and a SIGBUS (with an unusual EXC_BAD_ACCESS code 10) will occur when the program attempts to page in the memory. To combat this we force `libbacktrace` to be built with the simple `read` based fallback on Apple platforms.
| -rwxr-xr-x | src/libbacktrace/configure | 6 | ||||
| -rw-r--r-- | src/libbacktrace/configure.ac | 6 | ||||
| -rw-r--r-- | src/test/run-pass/issue-45731.rs | 34 |
3 files changed, 46 insertions, 0 deletions
diff --git a/src/libbacktrace/configure b/src/libbacktrace/configure index df6497fc646..873220794bd 100755 --- a/src/libbacktrace/configure +++ b/src/libbacktrace/configure @@ -12323,6 +12323,12 @@ fi fi fi + +case "${host_os}" in +darwin*) + have_mmap=no ;; +esac + if test "$have_mmap" = "no"; then VIEW_FILE=read.lo ALLOC_FILE=alloc.lo diff --git a/src/libbacktrace/configure.ac b/src/libbacktrace/configure.ac index 7ae21b8d1a6..ea1b27d807e 100644 --- a/src/libbacktrace/configure.ac +++ b/src/libbacktrace/configure.ac @@ -283,6 +283,12 @@ else AC_CHECK_FUNC(mmap, [have_mmap=yes], [have_mmap=no]) fi fi + +case "${host_os}" in +darwin*) + have_mmap=no ;; +esac + if test "$have_mmap" = "no"; then VIEW_FILE=read.lo ALLOC_FILE=alloc.lo diff --git a/src/test/run-pass/issue-45731.rs b/src/test/run-pass/issue-45731.rs new file mode 100644 index 00000000000..ec35035dab4 --- /dev/null +++ b/src/test/run-pass/issue-45731.rs @@ -0,0 +1,34 @@ +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// compile-flags:--test -g + +use std::{env, panic, fs}; + +#[cfg(target_os = "macos")] +#[test] +fn simple_test() { + // Find our dSYM and replace the DWARF binary with an empty file + let mut dsym_path = env::current_exe().unwrap(); + let executable_name = dsym_path.file_name().unwrap().to_str().unwrap().to_string(); + assert!(dsym_path.pop()); // Pop executable + dsym_path.push(format!("{}.dSYM/Contents/Resources/DWARF/{0}", executable_name)); + { + let file = fs::OpenOptions::new().read(false).write(true).truncate(true).create(false) + .open(&dsym_path).unwrap(); + } + + env::set_var("RUST_BACKTRACE", "1"); + + // We don't need to die of panic, just trigger a backtrace + let _ = panic::catch_unwind(|| { + assert!(false); + }); +} |
