gross fix for short messages crashing

SpiralP · Apr 25, 2020 · efc65bf · efc65bf
1 parent 625f891
commit efc65bf
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/src/chat/hidden_communication/clients.rs b/src/chat/hidden_communication/clients.rs
@@ -55,7 +55,10 @@ async fn do_query() -> Result<()> {
     timeout(Duration::from_secs(5), async {
         loop {
             let message = wait_for_message().await;
-            if &message.as_bytes()[0..1] == b"&" && &message.as_bytes()[2..] == b"Players using:" {
+            if message.len() >= 2
+                && (&message.as_bytes()[0..1] == b"&"
+                    && &message.as_bytes()[2..] == b"Players using:")
+            {
                 SHOULD_BLOCK.set(true);
                 break;
             }
@@ -70,8 +73,9 @@ async fn do_query() -> Result<()> {
     let timeout_result = timeout(Duration::from_secs(5), async {
         loop {
             let message = wait_for_message().await;
-            if (&message.as_bytes()[0..1] == b"&" && &message.as_bytes()[2..4] == b"  ")
-                || &message.as_bytes()[0..3] == b"> &"
+            if message.len() >= 4
+                && ((&message.as_bytes()[0..1] == b"&" && &message.as_bytes()[2..4] == b"  ")
+                    || &message.as_bytes()[0..3] == b"> &")
             {
                 // probably a /clients response
                 messages.push(message.to_string());

diff --git a/src/chat/hidden_communication/whispers/incoming.rs b/src/chat/hidden_communication/whispers/incoming.rs
@@ -24,9 +24,10 @@ async fn step() -> Result<()> {
     let message = wait_for_message().await;
 
     // incoming whisper
-    if &message.as_bytes()[0..1] == b"&"
-        && &message.as_bytes()[2..6] == b"[>] "
-        && message.ends_with(": &f?CEF?")
+    if message.len() >= 6
+        && (&message.as_bytes()[0..1] == b"&"
+            && &message.as_bytes()[2..6] == b"[>] "
+            && message.ends_with(": &f?CEF?"))
     {
         SHOULD_BLOCK.set(true);
 
@@ -71,9 +72,10 @@ async fn step() -> Result<()> {
                 loop {
                     let message = wait_for_message().await;
 
-                    if &message.as_bytes()[0..1] == b"&"
-                        && &message.as_bytes()[2..6] == b"[<] "
-                        && message.contains(": &f!CEF!")
+                    if message.len() >= 6
+                        && (&message.as_bytes()[0..1] == b"&"
+                            && &message.as_bytes()[2..6] == b"[<] "
+                            && message.contains(": &f!CEF!"))
                     {
                         SHOULD_BLOCK.set(true);
 

diff --git a/src/chat/hidden_communication/whispers/outgoing.rs b/src/chat/hidden_communication/whispers/outgoing.rs
@@ -18,9 +18,10 @@ pub async fn query_whisper(real_name: &str) -> Result<()> {
         loop {
             let message = wait_for_message().await;
 
-            if &message.as_bytes()[0..1] == b"&"
-                && &message.as_bytes()[2..6] == b"[<] "
-                && message.ends_with(": &f?CEF?")
+            if message.len() >= 6
+                && (&message.as_bytes()[0..1] == b"&"
+                    && &message.as_bytes()[2..6] == b"[<] "
+                    && message.ends_with(": &f?CEF?"))
             {
                 SHOULD_BLOCK.set(true);
                 break;
@@ -34,9 +35,10 @@ pub async fn query_whisper(real_name: &str) -> Result<()> {
     let full_message_encoded = timeout(Duration::from_secs(5), async {
         loop {
             let message = wait_for_message().await;
-            if &message.as_bytes()[0..1] == b"&"
-                && &message.as_bytes()[2..6] == b"[>] "
-                && message.contains(": &f!CEF!")
+            if message.len() >= 6
+                && (&message.as_bytes()[0..1] == b"&"
+                    && &message.as_bytes()[2..6] == b"[>] "
+                    && message.contains(": &f!CEF!"))
             {
                 SHOULD_BLOCK.set(true);
                 debug!("got whisper response {:?}", message);