minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix particles causing unitialised data being used due to use of incorrect union member

This commit is contained in:
Craig Robbins 2015-01-18 16:08:49 +10:00
parent db3466dbe8
commit 29514918f8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/particles.cpp
View File

@ -433,11 +433,11 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
{ {
JMutexAutoLock lock(m_spawner_list_lock); JMutexAutoLock lock(m_spawner_list_lock);
if (m_particle_spawners.find(event->delete_particlespawner.id) != if (m_particle_spawners.find(event->add_particlespawner.id) !=
m_particle_spawners.end()) m_particle_spawners.end())
{ {
delete m_particle_spawners.find(event->delete_particlespawner.id)->second; delete m_particle_spawners.find(event->add_particlespawner.id)->second;
m_particle_spawners.erase(event->delete_particlespawner.id); m_particle_spawners.erase(event->add_particlespawner.id);
} }
} }
video::ITexture *texture = video::ITexture *texture =
@ -475,7 +475,7 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
JMutexAutoLock lock(m_spawner_list_lock); JMutexAutoLock lock(m_spawner_list_lock);
m_particle_spawners.insert( m_particle_spawners.insert(
std::pair<u32, ParticleSpawner*>( std::pair<u32, ParticleSpawner*>(
event->delete_particlespawner.id, event->add_particlespawner.id,
toadd)); toadd));
} }