Skip to content
Merged
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion src/uucore/src/lib/parser/parse_glob.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ fn fix_negation(glob: &str) -> String {
while i + 3 < chars.len() {
if chars[i] == '[' && chars[i + 1] == '^' {
match chars[i + 3..].iter().position(|x| *x == ']') {
None => (),
None => {
// if closing square bracket not found, stop looking for it
// again
break;
}
Some(j) => {
chars[i + 1] = '!';
i += j + 4;
Expand Down Expand Up @@ -90,6 +94,11 @@ mod tests {
assert_eq!(fix_negation("[[]] [^a]"), "[[]] [!a]");
assert_eq!(fix_negation("[[] [^a]"), "[[] [!a]");
assert_eq!(fix_negation("[]] [^a]"), "[]] [!a]");

// test that we don't look for closing square brackets unnecessarily
// Verifies issue #5584
let chars = std::iter::repeat("^[").take(174571).collect::<String>();
assert_eq!(fix_negation(chars.as_str()), chars);
}

#[test]
Expand Down