From 2297286360c4a3aba0398d374287f981a8279c71 Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Wed, 13 Nov 2019 01:50:18 +0000
Subject: [PATCH] Fix TCP command interface rx buffer wrapping

Previously, if a message spanned the end of the
receive ring buffer, the last byte in the buffer
would be missing from the to-be-decoded message,
leading to a parse error or panic.

With this commit, >3M commands were exchanged
over one socket without further issues.
---
 src/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 4857c43..4c48a44 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -852,7 +852,7 @@ impl Server {
                     self.discard = true;
                     self.data.clear();
                 } else if !self.discard && len > 0 {
-                    self.data.extend_from_slice(&buf[..len - 1]).unwrap();
+                    self.data.extend_from_slice(&buf[..len]).unwrap();
                 }
                 (len, found)
             }).unwrap();
@@ -862,7 +862,7 @@ impl Server {
                     json_reply(socket, &Response { code: 520, message: "command buffer overflow" });
                     self.data.clear();
                 } else {
-                    let r = from_slice::<T>(&self.data);
+                    let r = from_slice::<T>(&self.data[..self.data.len() - 1]);
                     self.data.clear();
                     match r {
                         Ok(res) => {