Skip to content

diffutils: fix panic on non-UTF-8 argument ending in --width=N #250

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

Open
SAY-5 wants to merge 2 commits into
base: main
Choose a base branch
from
+51 −1
Open

diffutils: fix panic on non-UTF-8 argument ending in --width=N #250

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fdc882
diffutils: fix panic on non-UTF-8 argument ending in --width=N
SAY-5 Jun 20, 2026
8c9a0b3
diffutils: assert width-like operands are kept as filenames in tests
SAY-5 Sep 25, 2026
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
52 changes: 51 additions & 1 deletion src/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub fn parse_params<I: Iterator<Item = OsString>>(mut opts: Peekable<I>) -> Resu
let mut format = None;
let mut context = None;
let tabsize_re = Regex::new(r"^--tabsize=(?<num>\d+)$").unwrap();
let width_re = Regex::new(r"--width=(?P<long>\d+)$").unwrap();
let width_re = Regex::new(r"^--width=(?P<long>\d+)$").unwrap();
while let Some(param) = opts.next() {
let next_param = opts.peek();
if param == "--" {
Expand Down Expand Up @@ -813,6 +813,56 @@ mod tests {
.is_err());
}
#[test]
fn width() {
assert_eq!(
Ok(Params {
executable: os("diff"),
from: os("foo"),
to: os("bar"),
width: 100,
..Default::default()
}),
parse_params(
[os("diff"), os("--width=100"), os("foo"), os("bar")]
.iter()
.cloned()
.peekable()
)
);

@sylvestre sylvestre Sep 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also add a case for xyz--width=5 being an operand, since the PR changes that behavior

}
#[test]
fn width_suffix_is_an_operand() {
assert_eq!(
Ok(Params {
executable: os("diff"),
from: os("xyz--width=5"),
to: os("foo"),
..Default::default()
}),
parse_params(
[os("diff"), os("xyz--width=5"), os("foo")]
.iter()
.cloned()
.peekable()
)
);
}
#[cfg(unix)]
#[test]
fn width_non_utf8_is_not_an_option() {
use std::os::unix::ffi::OsStringExt;
// used to panic in into_string().unwrap()
let bad = OsString::from_vec(b"\xff--width=5".to_vec());
let params = parse_params(
[os("diff"), bad.clone(), os("foo")]
.iter()
.cloned()
.peekable(),
)
.unwrap();
assert_eq!(params.from, bad);
}
#[test]
fn double_dash() {
assert_eq!(
Ok(Params {
Expand Down
Loading