From 66061d5fb21561bad2d3f2d7ebeee54b14e54819 Mon Sep 17 00:00:00 2001
From: Giuseppe Guerra <to@nyo.zz.mu>
Date: Fri, 28 Jul 2017 22:32:30 +0200
Subject: [PATCH] Lock client buffers while writing

---
 objects/osuToken.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/objects/osuToken.py b/objects/osuToken.py
index 0e44796..56e2791 100644
--- a/objects/osuToken.py
+++ b/objects/osuToken.py
@@ -39,7 +39,8 @@ class token:
 		self.loginTime = int(time.time())
 		self.pingTime = self.loginTime
 		self.timeOffset = timeOffset
-		self.lock = threading.Lock()	# Sync primitive
+		self.lock = threading.Lock()
+		self.bufferLock = threading.Lock()
 		self.streams = []
 		self.tournament = tournament
 		self.messagesBuffer = []
@@ -102,6 +103,8 @@ class token:
 
 		:param bytes_: (packet) bytes to enqueue
 		"""
+		# Acquire the buffer lock
+		self.bufferLock.acquire()
 
 		# Never enqueue for IRC clients or Foka
 		if self.irc or self.userID < 999:
@@ -113,9 +116,14 @@ class token:
 		else:
 			log.warning("{}'s packets buffer is above 10M!! Lost some data!".format(self.username))
 
+		# Release the buffer lock
+		self.bufferLock.release()
+
 	def resetQueue(self):
 		"""Resets the queue. Call when enqueued packets have been sent"""
+		self.bufferLock.acquire()
 		self.queue = bytes()
+		self.bufferLock.release()
 
 	def joinChannel(self, channelObject):
 		"""