-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
std: Tweak stack overflow printing for robustness
The printing of the error message on stack overflow had two sometimes false assumptions previously. The first is that a local task was always available (it called Local::take) and the second is that it used println! instead of manually writing. The first assumption isn't necessarily true because while stack overflow will likely only be detected in situations that a local task is available, it's not guaranteed to always be in TLS. For example, during a println! call a task may be blocking, causing it to be unavailable. By using Local::try_take(), we can be resilient against these occurrences. The second assumption could lead to odd behavior because the stdout logger can be overwritten to run arbitrary code. Currently this should be possible, but the utility is much diminished because a stack overflow translates to an abort() instead of a failure.
- Loading branch information
1 parent
3c2650b
commit 4f4d43b
Showing
2 changed files
with
60 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
// Copyright 2012-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. | ||
|
||
// ignore-fast | ||
|
||
#[feature(asm)]; | ||
|
||
use std::io::Process; | ||
use std::os; | ||
use std::str; | ||
|
||
// lifted from the test module | ||
pub fn black_box<T>(dummy: T) { unsafe { asm!("" : : "r"(&dummy)) } } | ||
|
||
fn silent_recurse() { | ||
let buf = [0, ..1000]; | ||
black_box(buf); | ||
silent_recurse(); | ||
} | ||
|
||
fn loud_recurse() { | ||
println!("hello!"); | ||
loud_recurse(); | ||
} | ||
|
||
fn main() { | ||
let args = os::args(); | ||
if args.len() > 1 && args[1].as_slice() == "silent" { | ||
silent_recurse(); | ||
} else if args.len() > 1 && args[1].as_slice() == "loud" { | ||
loud_recurse(); | ||
} else { | ||
let silent = Process::output(args[0], [~"silent"]).unwrap(); | ||
assert!(!silent.status.success()); | ||
let error = str::from_utf8_lossy(silent.error); | ||
assert!(error.as_slice().contains("has overflowed its stack")); | ||
|
||
let loud = Process::output(args[0], [~"loud"]).unwrap(); | ||
assert!(!loud.status.success()); | ||
let error = str::from_utf8_lossy(silent.error); | ||
assert!(error.as_slice().contains("has overflowed its stack")); | ||
} | ||
} |
4f4d43b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from brson
at alexcrichton@4f4d43b
4f4d43b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging alexcrichton/rust/fix-stack-overflow = 4f4d43b into auto
4f4d43b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
alexcrichton/rust/fix-stack-overflow = 4f4d43b merged ok, testing candidate = eb86913
4f4d43b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4488
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/2330
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/2331
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/4486
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/3586
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3592
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/4501
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/3589
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/3595
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/4503
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/3589
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/3594
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/3663
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1442
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/4495
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/3596
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3602
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/4262
4f4d43b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = eb86913