From 1fd482b055e206d4f2ddaa9c4f672cf9c15f438a Mon Sep 17 00:00:00 2001
From: Richard Neumann <mail@richard-neumann.de>
Date: Sat, 20 Aug 2022 21:30:36 +0200
Subject: [PATCH] Fix packet reading race condition

---
 rcon/source/client.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/rcon/source/client.py b/rcon/source/client.py
index 59d0b03..b3e2760 100644
--- a/rcon/source/client.py
+++ b/rcon/source/client.py
@@ -39,22 +39,23 @@ class Client(BaseClient, socket_type=SOCK_STREAM):
         with self._socket.makefile('wb') as file:
             file.write(bytes(packet))
 
-        if self._frag_detect is not None:
-            with self._socket.makefile('wb') as file:
-                file.write(bytes(Packet.make_command(self._frag_detect)))
+        response = self.read()
 
-        return self.read()
+        if self._frag_detect is None:
+            return response
+
+        with self._socket.makefile('wb') as file:
+            file.write(bytes(Packet.make_command(self._frag_detect)))
+
+        while (successor := self.read()).id == response.id:
+            response += successor
+
+        return response
 
     def read(self) -> Packet:
         """Read a packet."""
         with self._socket.makefile('rb') as file:
-            packet = Packet.read(file)
-
-            if self._frag_detect is not None:
-                while (successor := Packet.read(file)).id == packet.id:
-                    packet += successor
-
-        return packet
+            return Packet.read(file)
 
     def login(self, passwd: str, *, encoding: str = 'utf-8') -> bool:
         """Perform a login."""