Remove unsafe usages (#173)

shotover · Sep 7, 2021 · d5cc4b6 · d5cc4b6
1 parent c889191
commit d5cc4b6
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 87 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/shotover-proxy/src/protocols/redis_codec.rs b/shotover-proxy/src/protocols/redis_codec.rs
@@ -479,7 +479,7 @@ impl RedisCodec {
         } else {
             Message::new_query(
                 QueryMessage {
-                    query_string: unsafe { String::from_utf8_unchecked(bulkstring.to_vec()) },
+                    query_string: String::from_utf8_lossy(bulkstring.as_ref()).to_string(),
                     namespace: vec![],
                     primary_key: Default::default(),
                     query_values: None,

diff --git a/shotover-proxy/src/transforms/redis_transforms/timestamp_tagging.rs b/shotover-proxy/src/transforms/redis_transforms/timestamp_tagging.rs
@@ -62,7 +62,7 @@ fn wrap_command(qm: &QueryMessage) -> Result<Value> {
                     .iter()
                     .map(|v| {
                         if let Value::Bytes(b) = v {
-                            unsafe { format!("'{}'", String::from_utf8_unchecked(b.to_vec())) }
+                            format!("'{}'", String::from_utf8_lossy(b.as_ref()))
                         } else {
                             // TODO this might not be right... but we should only be dealing with bytes
                             format!("{:?}", v)