holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix touch panics when using invalid timestamp (#6181)

Browse Source 
Signed-off-by: nibon7 <nibon7@163.com>
This commit is contained in:
nibon7 2022-07-29 19:41:28 +08:00 committed by GitHub
parent 2cffff0c1b
commit 9e24e452a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/nu-command/src/filesystem/touch.rs
View File

@ -140,14 +140,24 @@ impl Command for Touch {
10 => Some(AddYear::Full),
12 => Some(AddYear::FirstDigits),
14 => None,
_ => unreachable!(), // This should never happen as the check above should catch it
_ => {
return Err(ShellError::UnsupportedInput(
"input has an invalid timestamp".to_string(),
span,
))
}
}
} else {
match size {
8 => Some(AddYear::Full),
10 => Some(AddYear::FirstDigits),
12 => None,
_ => unreachable!(), // This should never happen as the check above should catch it
_ => {
return Err(ShellError::UnsupportedInput(
"input has an invalid timestamp".to_string(),
span,
))
}
}
};

17
crates/nu-command/tests/commands/touch.rs
View File

@ -766,3 +766,20 @@ fn not_create_file_if_it_not_exists() {
assert!(!path.exists());
})
}
#[test]
fn test_invalid_timestamp() {
Playground::setup("test_invalid_timestamp", |dirs, _sandbox| {
let outcome = nu!(
cwd: dirs.test(),
r#"touch -t 20220729. file.txt"#
);
assert!(outcome.err.contains("input has an invalid timestamp"));
let outcome = nu!(
cwd: dirs.test(),
r#"touch -t 20220729120099 file.txt"#
);
assert!(outcome.err.contains("input has an invalid timestamp"));
})
}