VectorCraft: An open-source, vector art tool written by scratch in pure Rust
Protect Windows device names followed by a space in safe_file_name
NetterSilver80363c7e6011
diff --git a/crates/engine/src/cmd/fileio/screens.rs b/crates/engine/src/cmd/fileio/screens.rsindex 1d9c0303c..e4c886e98 100644--- a/crates/engine/src/cmd/fileio/screens.rs+++ b/crates/engine/src/cmd/fileio/screens.rs@@ -164,11 +164,14 @@ pub(super) fn file_part(s: &str) -> String {/// trailing periods and spaces, and with `-` after a Windows device name that is the whole name or/// comes before its first period: `CON`, `PRN`, `AUX`, `NUL`, `COM1` to `COM9` and `LPT1` to `LPT9`,/// also with `¹`, `²` or `³` for the digit, in any case (`CON.png` becomes `CON-.png`). The same on-/// every platform.+/// every platform. Spaces between the device name and the period are dropped (`CON .png` becomes+/// `CON-.png`).pub(crate) fn safe_file_name(s: &str) -> String {let name = file_part(s);let name = name.trim_end_matches(['.', ' ']);let (base, rest) = name.split_at(name.find('.').unwrap_or(name.len()));+ // Windows ignores spaces before the extension, so `CON .png` is the CON device too.+ let base = base.trim_end_matches(' ');let upper = base.to_ascii_uppercase();let numbered = |n: &str| n.chars().count() == 1 && n.chars().all(|c| matches!(c, '1'..='9' | '¹' | '²' | '³'));let device = matches!(upper.as_str(), "CON" | "PRN" | "AUX" | "NUL")@@ -995,3 +998,18 @@ pub(crate) fn store_settings(s: &mut Session, settings: Map<String, Value>) -> Rpub(super) fn export_settings(s: &mut Session, _: &Value) -> Result<Value> {Ok(json!({ "settings": s.doc()?.doc.export_settings }))}++#[cfg(test)]+mod tests {+ use super::safe_file_name;++ #[test]+ fn device_name_with_space_before_extension_is_protected() {+ assert_eq!(safe_file_name("CON.png"), "CON-.png");+ assert_eq!(safe_file_name("CON .png"), "CON-.png");+ assert_eq!(safe_file_name("NUL .png"), "NUL-.png");+ assert_eq!(safe_file_name("COM1 .png"), "COM1-.png");+ assert_eq!(safe_file_name("lpt9 .png"), "lpt9-.png");+ assert_eq!(safe_file_name("My CON .png"), "My CON .png");+ }+}