Merge branch 'rust-fuzz:master' into master

vanhauser-thc · web-flow · commit 8a1ac1040b18 · 2025-10-07T18:15:49.000+02:00
diff --git a/.rgignore b/.rgignore
@@ -0,0 +1 @@
+cargo-afl/AFLplusplus
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## 0.15.24
+
+- [Update AFLplusplus to 4.34c](https://github.com/rust-fuzz/afl.rs/pull/660)
+
 ## 0.15.23
 
 - Internal refactor. The changes should not be noticeable to end users. If you experience breakage, please open an [issue](https://github.com/rust-fuzz/afl.rs/issues).
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/afl/Cargo.toml b/afl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "afl"
-version = "0.15.23"
+version = "0.15.24"
 readme = "README.md"
 license = "Apache-2.0"
 authors = [
diff --git a/cargo-afl/Cargo.toml b/cargo-afl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-afl"
-version = "0.15.23"
+version = "0.15.24"
 readme = "README.md"
 license = "Apache-2.0"
 authors = [
diff --git a/cargo-afl/src/common.rs b/cargo-afl/src/common.rs
@@ -5,6 +5,8 @@ use std::env;
 use std::ffi::OsStr;
 use std::path::{Path, PathBuf};
 
+pub const OBJECT_FILE_NAME: &str = "afl-compiler-rt.o";
+
 fn xdg_base_dir() -> xdg::BaseDirectories {
     xdg::BaseDirectories::with_prefix("afl.rs")
 }
@@ -52,7 +54,7 @@ pub fn afl_llvm_dir() -> Result<PathBuf> {
 }
 
 pub fn object_file_path() -> Result<PathBuf> {
-    afl_llvm_dir().map(|path| path.join("libafl-llvm-rt.o"))
+    afl_llvm_dir().map(|path| path.join(OBJECT_FILE_NAME))
 }
 
 pub fn plugins_available() -> Result<bool> {
diff --git a/cargo-afl/src/config.rs b/cargo-afl/src/config.rs
@@ -125,7 +125,7 @@ fn build_afl(args: &Args, work_dir: &Path) -> Result<()> {
 
 fn build_afl_llvm_runtime(_args: &Args, work_dir: &Path) -> Result<()> {
     let object_file_path = common::object_file_path()?;
-    let _: u64 = std::fs::copy(work_dir.join("afl-compiler-rt.o"), &object_file_path)
+    let _: u64 = std::fs::copy(work_dir.join(common::OBJECT_FILE_NAME), &object_file_path)
         .with_context(|| "could not copy object file")?;
 
     Ok(())

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ use std::env;`
`5`	`5`	`use std::ffi::OsStr;`
`6`	`6`	`use std::path::{Path, PathBuf};`
`7`	`7`
	`8`	`+pub const OBJECT_FILE_NAME: &str = "afl-compiler-rt.o";`
	`9`	`+`
`8`	`10`	`fn xdg_base_dir() -> xdg::BaseDirectories {`
`9`	`11`	`xdg::BaseDirectories::with_prefix("afl.rs")`
`10`	`12`	`}`
`@@ -52,7 +54,7 @@ pub fn afl_llvm_dir() -> Result<PathBuf> {`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`pub fn object_file_path() -> Result<PathBuf> {`
`55`		`- afl_llvm_dir().map(\|path\| path.join("libafl-llvm-rt.o"))`
	`57`	`+ afl_llvm_dir().map(\|path\| path.join(OBJECT_FILE_NAME))`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`pub fn plugins_available() -> Result<bool> {`