62d046f · helix · git.iko.soy

on master help sign in

Fix utf8 length handling for shellwords (#5738)

62d046fMike Trinkala4 years ago

helix-core/src/shellwords.rs+16−2

@@ -129,8 +129,9 @@ impl<'a> From<&'a str> for Shellwords<'a> {

129 DquoteEscaped => Dquoted,

130 };

131

132+ let c_len = c.len_utf8();

132− if i >= input.len() - 1 && end == 0 {

133+ if i == input.len() - c_len && end == 0 {

133− end = i + 1;

134+ end = i + c_len;

134 }

135 }

135

136

136 if end > 0 {

137 if end > 0 {

@@ -333,4 +334,17 @@ mod test {

333 assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);

334 assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);

334 assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\"]);

335 assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\"]);

335 }

336 }

337+

338+ #[test]

339+ fn test_multibyte_at_end() {

340+ assert_eq!(Shellwords::from("𒀀").parts(), &["𒀀"]);

341+ assert_eq!(

342+ Shellwords::from(":sh echo 𒀀").parts(),

343+ &[":sh", "echo", "𒀀"]

344+ );

345+ assert_eq!(

346+ Shellwords::from(":sh echo 𒀀 hello world𒀀").parts(),

347+ &[":sh", "echo", "𒀀", "hello", "world𒀀"]

348+ );

349+ }

336}

350}