diff --git a/casr/Cargo.toml b/casr/Cargo.toml index e3e3fdd9..412e827e 100644 --- a/casr/Cargo.toml +++ b/casr/Cargo.toml @@ -18,14 +18,14 @@ chrono = "0.4" goblin = "0.8" log = "0.4" simplelog = "0.12" -cursive = { version = "0.20", default-features = false, features = ["termion-backend"] } -cursive_tree_view = "0.8" +cursive = { version = "0.21", default-features = false, features = ["termion-backend"] } +cursive_tree_view = "0.9" gdb-command = "0.7" nix = "0.26" rayon = "1.10" num_cpus = "1.16" is_executable = "1.0" -linux-personality = "1.0" +linux-personality = "2.0" colored = "2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/casr/src/bin/casr-cli.rs b/casr/src/bin/casr-cli.rs index 2676c0b4..30ddcce5 100644 --- a/casr/src/bin/casr-cli.rs +++ b/casr/src/bin/casr-cli.rs @@ -385,7 +385,7 @@ fn build_tree_report( } for line in report.disassembly.iter() { - tree.insert_item(line.clone(), Placement::LastChild, row); + tree.insert_item(line.replace('\t', " "), Placement::LastChild, row); } } @@ -627,7 +627,10 @@ fn build_slider_report( }); if !report.disassembly.is_empty() { - state.push_str(&format!("\n{}", &report.disassembly.join("\n"))); + state.push_str(&format!( + "\n{}", + &report.disassembly.join("\n").replace('\t', " ") + )); } if !state.is_empty() { select.add_item("CrashState", state); diff --git a/casr/src/bin/casr-san.rs b/casr/src/bin/casr-san.rs index d3393f15..5ed95769 100644 --- a/casr/src/bin/casr-san.rs +++ b/casr/src/bin/casr-san.rs @@ -147,11 +147,11 @@ fn main() -> Result<()> { } #[cfg(target_os = "linux")] { - use linux_personality::{personality, ADDR_NO_RANDOMIZE}; + use linux_personality::{personality, Personality}; unsafe { sanitizers_cmd.pre_exec(|| { - if personality(ADDR_NO_RANDOMIZE).is_err() { + if personality(Personality::ADDR_NO_RANDOMIZE).is_err() { panic!("Cannot set personality"); } Ok(())