Skip to content
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

Fix segfault on tagged output #175

Merged
merged 3 commits into from
May 21, 2024
Merged

Fix segfault on tagged output #175

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd71487
Fix segfault on tagged output
ausbin May 21, 2024
616de55
Merge branch 'main' into bugfix/tagged-output
swernli May 21, 2024
a176c39
Merge branch 'main' into bugfix/tagged-output
swernli May 21, 2024
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
27 changes: 24 additions & 3 deletions stdlib/src/output_recording.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

use std::{
ffi::{c_char, c_double, CString},
ffi::{c_char, c_double, CStr, CString},
fmt::Display,
io::{Read, Write},
};
Expand Down Expand Up @@ -118,7 +118,7 @@ pub unsafe fn record_output(ty: &str, val: &dyn Display, tag: *mut c_char) -> st
if !tag.is_null() {
output.write_all(b"\t").expect("Failed to write output");
output
.write_all(CString::from_raw(tag).as_bytes())
.write_all(CStr::from_ptr(tag).to_bytes())
.expect("Failed to write output");
}
output.write_newline();
Expand Down Expand Up @@ -268,10 +268,31 @@ mod tests {
let val: i64 = 42;
assert_untagged_output_match("ARRAY", &val, "OUTPUT\tARRAY\t42");
}
#[test]
fn test_output_bool_true_tagged_from_cstring() {
let val: bool = true;
let tag = CString::new("YEEHAW").unwrap().into_raw();
assert_output_match("BOOL", &val, tag, "OUTPUT\tBOOL\ttrue\tYEEHAW");
// Avoid memory leak
unsafe {
let _ = CString::from_raw(tag);
}
}
#[test]
fn test_output_bool_true_tagged_not_from_cstring() {
let val: bool = true;
let mut tag: [c_char; 3] = [0x68, 0x69, 0];
// With any luck, this will segfault if the tag pointer is incorrectly
// passed to CString::from_raw(). (Thankfully, it does on my system.)
assert_output_match("BOOL", &val, tag.as_mut_ptr(), "OUTPUT\tBOOL\ttrue\thi");
}
fn assert_untagged_output_match(ty: &str, val: &dyn Display, expected_str: &str) {
assert_output_match(ty, val, null_mut(), expected_str);
}
fn assert_output_match(ty: &str, val: &dyn Display, tag: *mut c_char, expected_str: &str) {
OUTPUT.with(|output| output.borrow_mut().use_std_out(false));
unsafe {
record_output(ty, &val, null_mut()).expect("Failed to write output");
record_output(ty, &val, tag).expect("Failed to write output");
}

let actual = OUTPUT.with(|output| {
Expand Down
Loading