From 161b1943ebcd4d7d8fadfb9d812f3621fe00dcda Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 6 Mar 2021 02:55:14 +0800 Subject: [PATCH] fix push() function on string didn't hnadle variable length encoding of the utf8 correctly --- xous-rs/src/string.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xous-rs/src/string.rs b/xous-rs/src/string.rs index 3d31931ce..88589d340 100644 --- a/xous-rs/src/string.rs +++ b/xous-rs/src/string.rs @@ -105,9 +105,9 @@ impl String { }, _ => { let mut data: [u8; 4] = [0; 4]; - ch.encode_utf8(&mut data); - if self.len() + data.len() < self.bytes.len() { - for &c in data.iter() { + let subslice = ch.encode_utf8(&mut data); + if self.len() + subslice.len() < self.bytes.len() { + for c in subslice.bytes() { self.bytes[self.len()] = c; self.len += 1; }