From bb675c5f56c6ddb5d450df53d2685f519dc8d78c Mon Sep 17 00:00:00 2001 From: Michael Sloan Date: Thu, 30 Jan 2020 00:55:36 -0700 Subject: Fix roundtripping of \u001f and \u007f in toml string literals (#372) --- src/ser.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ser.rs b/src/ser.rs index b4737cc..90cfcd7 100644 --- a/src/ser.rs +++ b/src/ser.rs @@ -569,8 +569,9 @@ impl<'a> Serializer<'a> { match ch { '\t' => {} '\n' => ty = Type::NewlineTripple, - // note that the following are invalid: \b \f \r - c if c < '\u{1f}' => can_be_pretty = false, // Invalid control character + // Escape codes are needed if any ascii control + // characters are present, including \b \f \r. + c if c <= '\u{1f}' || c == '\u{7f}' => can_be_pretty = false, _ => {} } out.push(ch); @@ -646,7 +647,7 @@ impl<'a> Serializer<'a> { '\u{d}' => self.dst.push_str("\\r"), '\u{22}' => self.dst.push_str("\\\""), '\u{5c}' => self.dst.push_str("\\\\"), - c if c < '\u{1f}' => { + c if c <= '\u{1f}' || c == '\u{7f}' => { write!(self.dst, "\\u{:04X}", ch as u32).map_err(ser::Error::custom)?; } ch => self.dst.push(ch), -- cgit v1.2.3