moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-22 23:58:48 -05:00
Code Issues Releases Wiki Activity

Protect Player::hud from concurrent modifications

Browse Source 
Sometimes HUD can be modified by ServerThread and EmergeThread results in a crash on client side because the HUD is not correct
This commit is contained in:
Loic Blot 2015-03-22 20:09:44 +01:00
parent d6638b4300
commit 0e5e49736c
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/player.cpp
View File

@ -240,6 +240,7 @@ void Player::deSerialize(std::istream &is, std::string playername)
u32 Player::addHud(HudElement *toadd) u32 Player::addHud(HudElement *toadd)
{ {
JMutexAutoLock lock(m_mutex);
u32 id = getFreeHudID(); u32 id = getFreeHudID();
if (id < hud.size()) if (id < hud.size())
@ -252,6 +253,8 @@ u32 Player::addHud(HudElement *toadd)
HudElement* Player::getHud(u32 id) HudElement* Player::getHud(u32 id)
{ {
JMutexAutoLock lock(m_mutex);
if (id < hud.size()) if (id < hud.size())
return hud[id]; return hud[id];
@ -260,6 +263,8 @@ HudElement* Player::getHud(u32 id)
HudElement* Player::removeHud(u32 id) HudElement* Player::removeHud(u32 id)
{ {
JMutexAutoLock lock(m_mutex);
HudElement* retval = NULL; HudElement* retval = NULL;
if (id < hud.size()) { if (id < hud.size()) {
retval = hud[id]; retval = hud[id];
@ -270,6 +275,8 @@ HudElement* Player::removeHud(u32 id)
void Player::clearHud() void Player::clearHud()
{ {
JMutexAutoLock lock(m_mutex);
while(!hud.empty()) { while(!hud.empty()) {
delete hud.back(); delete hud.back();
hud.pop_back(); hud.pop_back();

9
src/player.h
View File

@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_bloated.h" #include "irrlichttypes_bloated.h"
#include "inventory.h" #include "inventory.h"
#include "constants.h" // BS #include "constants.h" // BS
#include "jthread/jmutexautolock.h"
#include <list> #include <list>
#define PLAYERNAME_SIZE 20 #define PLAYERNAME_SIZE 20
@ -202,7 +203,8 @@ public:
return m_collisionbox; return m_collisionbox;
} }
u32 getFreeHudID() const { u32 getFreeHudID() {
JMutexAutoLock lock(m_mutex);
size_t size = hud.size(); size_t size = hud.size();
for (size_t i = 0; i != size; i++) { for (size_t i = 0; i != size; i++) {
if (!hud[i]) if (!hud[i])
@ -318,6 +320,11 @@ protected:
bool m_dirty; bool m_dirty;
std::vector<HudElement *> hud; std::vector<HudElement *> hud;
private:
// Protect some critical areas
// hud for example can be modified by EmergeThread
// and ServerThread
JMutex m_mutex;
}; };