Skip to content

Commit

Permalink
Update dependencies to suppress cargo audit and deprecated code warnings
Browse files Browse the repository at this point in the history
Also, fix CI: Atheris fails to compile with fresh Python on latest Ubuntu 24.04
  • Loading branch information
SweetVishnya committed Dec 19, 2024
1 parent af9e9e4 commit 6bf99e2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ jobs:
run: cargo build --all-features --verbose
- name: Run tests
run: |
sudo add-apt-repository ppa:deadsnakes/ppa
sudo apt update && sudo apt install -y gdb pip curl python3.10-dev llvm \
openjdk-17-jdk ca-certificates gnupg
pip3 install atheris
python3.10 -m pip install atheris
sudo mkdir -p /etc/apt/keyrings
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
export NODE_MAJOR=20
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ jobs:
- uses: actions/checkout@v4
- name: Install Dependences
run: |
sudo add-apt-repository ppa:deadsnakes/ppa
sudo apt update && sudo apt install -y gdb pip curl python3.10-dev llvm \
openjdk-17-jdk ca-certificates gnupg
pip3 install atheris
python3.10 -m pip install atheris
sudo mkdir -p /etc/apt/keyrings
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
export NODE_MAJOR=20
Expand Down
6 changes: 3 additions & 3 deletions casr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 5 additions & 2 deletions casr/src/bin/casr-cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions casr/src/bin/casr-san.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
Expand Down

0 comments on commit 6bf99e2

Please sign in to comment.