Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
util: Prevent panic when parsing a malformed shell variable (#63446)
Alice48461eaadd
diff --git a/crates/util/src/shell.rs b/crates/util/src/shell.rsindex 985d352b656..5b91ec575a0 100644--- a/crates/util/src/shell.rs+++ b/crates/util/src/shell.rs@@ -245,13 +245,13 @@ impl ShellKind {fn to_cmd_variable(input: &str) -> String {if let Some(var_str) = input.strip_prefix("${") {- if var_str.find(':').is_none() {- // If the input starts with "${", remove the trailing "}"- format!("%{}%", &var_str[..var_str.len() - 1])- } else {+ match var_str.strip_suffix('}') {+ Some(var_name) if !var_name.is_empty() && !var_name.contains(':') => {+ format!("%{var_name}%")+ }// `${SOME_VAR:-SOME_DEFAULT}`, we currently do not handle this situation,// which will result in the task failing to run in such cases.- input.into()+ _ => input.into(),}} else if let Some(var_str) = input.strip_prefix('$') {// If the input starts with "$", directly append to "$env:"@@ -264,13 +264,13 @@ impl ShellKind {fn to_powershell_variable(input: &str) -> String {if let Some(var_str) = input.strip_prefix("${") {- if var_str.find(':').is_none() {- // If the input starts with "${", remove the trailing "}"- format!("$env:{}", &var_str[..var_str.len() - 1])- } else {+ match var_str.strip_suffix('}') {+ Some(var_name) if !var_name.is_empty() && !var_name.contains(':') => {+ format!("$env:{var_name}")+ }// `${SOME_VAR:-SOME_DEFAULT}`, we currently do not handle this situation,// which will result in the task failing to run in such cases.- input.into()+ _ => input.into(),}} else if let Some(var_str) = input.strip_prefix('$') {// If the input starts with "$", directly append to "$env:"@@ -954,4 +954,40 @@ mod tests {assert!(quoted.contains("O''Brien"));}}++ #[test]+ fn test_to_shell_variable() {+ assert_eq!(+ ShellKind::PowerShell.to_shell_variable("${FOO}"),+ "$env:FOO"+ );+ assert_eq!(ShellKind::Pwsh.to_shell_variable("${FOO}"), "$env:FOO");+ assert_eq!(ShellKind::Cmd.to_shell_variable("${FOO}"), "%FOO%");+ assert_eq!(ShellKind::Nushell.to_shell_variable("${FOO}"), "$env.FOO");+ assert_eq!(ShellKind::Posix.to_shell_variable("${FOO}"), "${FOO}");++ assert_eq!(ShellKind::PowerShell.to_shell_variable("$FOO"), "$env:FOO");+ assert_eq!(+ ShellKind::PowerShell.to_shell_variable("${日本}"),+ "$env:日本"+ );+ assert_eq!(+ ShellKind::PowerShell.to_shell_variable("${FOO:-bar}"),+ "${FOO:-bar}"+ );+ }++ #[test]+ fn test_to_shell_variable_malformed_is_passed_through() {+ for input in ["${", "${FOO", "${café", "${}", "${日本"] {+ for shell_kind in [+ ShellKind::PowerShell,+ ShellKind::Pwsh,+ ShellKind::Cmd,+ ShellKind::Nushell,+ ] {+ assert_eq!(shell_kind.to_shell_variable(input), input);+ }+ }+ }}