Skip to content

Internal changes #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Internal changes #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions pixel_bridge/rust/image.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ impl Frames {
}

fn format_panic(err: Box<dyn std::any::Any + Send>) -> String {
let backtrace = std::backtrace::Backtrace::capture();
let msg = if let Some(msg) = err.downcast_ref::<&str>() {
*msg
} else if let Some(msg) = err.downcast_ref::<String>() {
Expand All @@ -299,7 +298,15 @@ fn format_panic(err: Box<dyn std::any::Any + Send>) -> String {
};
// This error message needs to start with "Rust panic caught", as
// that is how we identify it on the C++ side.
format!("Rust panic caught: {}\nBacktrace:\n{}", msg, backtrace)
//
// Deliberately does not capture a `std::backtrace::Backtrace` here:
// capturing unwinds via `_Unwind_Backtrace` -> `dl_iterate_phdr` while
// holding a process-global, non-reentrant lock, and allocates while doing
// so. That deadlocks against a sampling allocator (rust-lang/rust#130187)
// and lock-order-inverts against TSAN's loader interceptors. Since this
// path runs on every malformed image, re-adding it turns a decode of
// attacker-controlled input into a denial of service.
format!("Rust panic caught: {}", msg)
}

fn run_catching_panics<F, T>(f: F) -> Result<T, String>
Expand Down
Loading