From 0e5e49736c0a5fa29bca257bafc02d7c7a7171c9 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 22 Mar 2015 20:09:44 +0100
Subject: Protect Player::hud from concurrent modifications Sometimes HUD can
 be modified by ServerThread and EmergeThread results in a crash on client
 side because the HUD is not correct

---
 src/player.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/player.cpp')

diff --git a/src/player.cpp b/src/player.cpp
index 0da761eed..88c5634e3 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -240,6 +240,7 @@ void Player::deSerialize(std::istream &is, std::string playername)
 
 u32 Player::addHud(HudElement *toadd)
 {
+	JMutexAutoLock lock(m_mutex);
 	u32 id = getFreeHudID();
 
 	if (id < hud.size())
@@ -252,6 +253,8 @@ u32 Player::addHud(HudElement *toadd)
 
 HudElement* Player::getHud(u32 id)
 {
+	JMutexAutoLock lock(m_mutex);
+
 	if (id < hud.size())
 		return hud[id];
 
@@ -260,6 +263,8 @@ HudElement* Player::getHud(u32 id)
 
 HudElement* Player::removeHud(u32 id)
 {
+	JMutexAutoLock lock(m_mutex);
+
 	HudElement* retval = NULL;
 	if (id < hud.size()) {
 		retval = hud[id];
@@ -270,6 +275,8 @@ HudElement* Player::removeHud(u32 id)
 
 void Player::clearHud()
 {
+	JMutexAutoLock lock(m_mutex);
+
 	while(!hud.empty()) {
 		delete hud.back();
 		hud.pop_back();
-- 
cgit v1.2.3