SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring back placeholder value in CommandExecutor to fix #2541 (#2543)

Browse Source
This commit is contained in:
Dominik Maier 2024-09-23 15:59:06 +02:00 committed by GitHub
parent 173a9ad8ea
commit 35779863c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libafl/src/executors/command.rs
View File

@ -105,7 +105,7 @@ where
for (i, arg) in args.enumerate() { for (i, arg) in args.enumerate() {
if i == *argnum { if i == *argnum {
debug_assert_eq!(arg, "DUMMY"); debug_assert_eq!(arg, "PLACEHOLDER");
#[cfg(unix)] #[cfg(unix)]
cmd.arg(OsStr::from_bytes(input.target_bytes().as_slice())); cmd.arg(OsStr::from_bytes(input.target_bytes().as_slice()));
// There is an issue here that the chars on Windows are 16 bit wide. // There is an issue here that the chars on Windows are 16 bit wide.
@ -379,7 +379,8 @@ impl CommandExecutorBuilder {
pub fn arg_input_arg(&mut self) -> &mut Self { pub fn arg_input_arg(&mut self) -> &mut Self {
let argnum = self.args.len(); let argnum = self.args.len();
self.input(InputLocation::Arg { argnum }); self.input(InputLocation::Arg { argnum });
// self.arg("DUMMY"); // Placeholder arg that gets replaced with the input name later.
self.arg("PLACEHOLDER");
self self
} }

2
libafl/src/observers/concolic/serialization_format.rs
View File

@ -242,7 +242,7 @@ impl<W: Write + Seek> MessageFileWriter<W> {
/// Create a `MessageFileWriter` from the given [`Write`]. /// Create a `MessageFileWriter` from the given [`Write`].
pub fn from_writer(mut writer: W) -> io::Result<Self> { pub fn from_writer(mut writer: W) -> io::Result<Self> {
let writer_start_position = writer.stream_position()?; let writer_start_position = writer.stream_position()?;
// write dummy trace length // write preliminary trace length
writer.write_all(&0_u64.to_le_bytes())?; writer.write_all(&0_u64.to_le_bytes())?;
Ok(Self { Ok(Self {
id_counter: 1, id_counter: 1,