bugfix: fix a crash problem due to incorrect utf8 slicing (#13)

dfinity · Jan 31, 2022 · b0de043 · b0de043
1 parent 4b0edcf
commit b0de043
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -214,11 +214,13 @@ async fn forward_request(
 
     slog::trace!(logger, "<<");
     if logger.is_trace_enabled() {
-        let body = String::from_utf8_lossy(&entire_body);
+        let body = String::from_utf8_lossy(
+            &entire_body[0..usize::min(entire_body.len(), MAX_LOG_BODY_SIZE)],
+        );
         slog::trace!(
             logger,
-            "<< {}{}",
-            &body[0..usize::min(body.len(), MAX_LOG_BODY_SIZE)],
+            "<< \"{}\"{}",
+            &body.escape_default(),
             if body.len() > MAX_LOG_BODY_SIZE {
                 format!("... {} bytes total", body.len())
             } else {
@@ -449,14 +451,9 @@ async fn forward_request(
         slog::trace!(logger, ">>");
         slog::trace!(
             logger,
-            ">> {}{}",
-            match std::str::from_utf8(&body) {
-                Ok(s) => format!(
-                    r#""{}""#,
-                    s[..usize::min(MAX_LOG_BODY_SIZE, s.len())].escape_default()
-                ),
-                Err(_) => hex::encode(&body[..usize::min(MAX_LOG_BODY_SIZE, body.len())]),
-            },
+            ">> \"{}\"{}",
+            String::from_utf8_lossy(&body[..usize::min(MAX_LOG_BODY_SIZE, body.len())])
+                .escape_default(),
             if is_streaming {
                 "... streaming".to_string()
             } else if body.len() > MAX_LOG_BODY_SIZE {