From 51e2f64e5b7191a1b34c39a527e75b2435b59bef Mon Sep 17 00:00:00 2001 From: WorksButNotTested <62701594+WorksButNotTested@users.noreply.github.com> Date: Mon, 7 Aug 2023 01:54:49 -0700 Subject: [PATCH] gdb_qemu: Ignore UTF-8 errors (#1403) Co-authored-by: Your Name Co-authored-by: Dominik Maier --- utils/gdb_qemu/gdb_qemu/src/parent.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/utils/gdb_qemu/gdb_qemu/src/parent.rs b/utils/gdb_qemu/gdb_qemu/src/parent.rs index 8faadefa00..30648ac377 100644 --- a/utils/gdb_qemu/gdb_qemu/src/parent.rs +++ b/utils/gdb_qemu/gdb_qemu/src/parent.rs @@ -7,7 +7,6 @@ use { io::{Read, Write}, net::{SocketAddr, TcpStream}, os::fd::RawFd, - str::from_utf8, thread::spawn, time::{Duration, SystemTime}, }, @@ -61,8 +60,7 @@ impl Parent { } fn log_packets(direction: &Direction, buffer: &[u8]) -> Result<()> { - for pkt in from_utf8(buffer) - .map_err(|e| anyhow!("Failed to read buffer: {e:}"))? + for pkt in String::from_utf8_lossy(buffer) .split('$') .filter(|x| !x.is_empty()) .filter(|x| x != &"+") @@ -73,8 +71,7 @@ impl Parent { } fn log_io(channel: &Channel, buffer: &[u8]) -> Result<()> { - for line in from_utf8(buffer) - .map_err(|e| anyhow!("Failed to read buffer: {e:}"))? + for line in String::from_utf8_lossy(buffer) .lines() .filter(|x| !x.is_empty()) {