mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 19:34:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed various reentrant-unsafe 2D array element unsets (similar to previous commit)

Browse Source 
this pattern was used in various places
This commit is contained in:
Dylan K. Taylor 2023-11-01 16:28:59 +00:00
parent abce512860
commit e6e2c54ec9
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Server.php
View File

@ -1259,9 +1259,10 @@ class Server{
*/ */
public function unsubscribeFromBroadcastChannel(string $channelId, CommandSender $subscriber) : void{ public function unsubscribeFromBroadcastChannel(string $channelId, CommandSender $subscriber) : void{
if(isset($this->broadcastSubscribers[$channelId][spl_object_id($subscriber)])){ if(isset($this->broadcastSubscribers[$channelId][spl_object_id($subscriber)])){
unset($this->broadcastSubscribers[$channelId][spl_object_id($subscriber)]); if(count($this->broadcastSubscribers[$channelId]) === 1){
if(count($this->broadcastSubscribers[$channelId]) === 0){
unset($this->broadcastSubscribers[$channelId]); unset($this->broadcastSubscribers[$channelId]);
}else{
unset($this->broadcastSubscribers[$channelId][spl_object_id($subscriber)]);
} }
} }
} }

7
src/plugin/PluginManager.php
View File

@ -510,9 +510,12 @@ class PluginManager{
unset($this->enabledPlugins[$plugin->getDescription()->getName()]); unset($this->enabledPlugins[$plugin->getDescription()->getName()]);
foreach(Utils::stringifyKeys($this->pluginDependents) as $dependency => $dependentList){ foreach(Utils::stringifyKeys($this->pluginDependents) as $dependency => $dependentList){
unset($this->pluginDependents[$dependency][$plugin->getDescription()->getName()]); if(isset($this->pluginDependents[$dependency][$plugin->getDescription()->getName()])){
if(count($this->pluginDependents[$dependency]) === 0){ if(count($this->pluginDependents[$dependency]) === 1){
unset($this->pluginDependents[$dependency]); unset($this->pluginDependents[$dependency]);
}else{
unset($this->pluginDependents[$dependency][$plugin->getDescription()->getName()]);
}
} }
} }

27
src/world/World.php
View File

@ -826,14 +826,15 @@ class World implements ChunkManager{
$chunkHash = World::chunkHash($chunkX, $chunkZ); $chunkHash = World::chunkHash($chunkX, $chunkZ);
$loaderId = spl_object_id($loader); $loaderId = spl_object_id($loader);
if(isset($this->chunkLoaders[$chunkHash][$loaderId])){ if(isset($this->chunkLoaders[$chunkHash][$loaderId])){
unset($this->chunkLoaders[$chunkHash][$loaderId]); if(count($this->chunkLoaders[$chunkHash]) === 1){
if(count($this->chunkLoaders[$chunkHash]) === 0){
unset($this->chunkLoaders[$chunkHash]); unset($this->chunkLoaders[$chunkHash]);
$this->unloadChunkRequest($chunkX, $chunkZ, true); $this->unloadChunkRequest($chunkX, $chunkZ, true);
if(isset($this->chunkPopulationRequestMap[$chunkHash]) && !isset($this->activeChunkPopulationTasks[$chunkHash])){ if(isset($this->chunkPopulationRequestMap[$chunkHash]) && !isset($this->activeChunkPopulationTasks[$chunkHash])){
$this->chunkPopulationRequestMap[$chunkHash]->reject(); $this->chunkPopulationRequestMap[$chunkHash]->reject();
unset($this->chunkPopulationRequestMap[$chunkHash]); unset($this->chunkPopulationRequestMap[$chunkHash]);
} }
}else{
unset($this->chunkLoaders[$chunkHash][$loaderId]);
} }
} }
} }
@ -861,11 +862,12 @@ class World implements ChunkManager{
public function unregisterChunkListener(ChunkListener $listener, int $chunkX, int $chunkZ) : void{ public function unregisterChunkListener(ChunkListener $listener, int $chunkX, int $chunkZ) : void{
$hash = World::chunkHash($chunkX, $chunkZ); $hash = World::chunkHash($chunkX, $chunkZ);
if(isset($this->chunkListeners[$hash])){ if(isset($this->chunkListeners[$hash])){
unset($this->chunkListeners[$hash][spl_object_id($listener)]); if(count($this->chunkListeners[$hash]) === 1){
unset($this->playerChunkListeners[$hash][spl_object_id($listener)]);
if(count($this->chunkListeners[$hash]) === 0){
unset($this->chunkListeners[$hash]); unset($this->chunkListeners[$hash]);
unset($this->playerChunkListeners[$hash]); unset($this->playerChunkListeners[$hash]);
}else{
unset($this->chunkListeners[$hash][spl_object_id($listener)]);
unset($this->playerChunkListeners[$hash][spl_object_id($listener)]);
} }
} }
} }
@ -1224,13 +1226,14 @@ class World implements ChunkManager{
$chunkHash = World::chunkHash($chunkX, $chunkZ); $chunkHash = World::chunkHash($chunkX, $chunkZ);
$tickerId = spl_object_id($ticker); $tickerId = spl_object_id($ticker);
if(isset($this->registeredTickingChunks[$chunkHash][$tickerId])){ if(isset($this->registeredTickingChunks[$chunkHash][$tickerId])){
unset($this->registeredTickingChunks[$chunkHash][$tickerId]); if(count($this->registeredTickingChunks[$chunkHash]) === 1){
if(count($this->registeredTickingChunks[$chunkHash]) === 0){
unset( unset(
$this->registeredTickingChunks[$chunkHash], $this->registeredTickingChunks[$chunkHash],
$this->recheckTickingChunks[$chunkHash], $this->recheckTickingChunks[$chunkHash],
$this->validTickingChunks[$chunkHash] $this->validTickingChunks[$chunkHash]
); );
}else{
unset($this->registeredTickingChunks[$chunkHash][$tickerId]);
} }
} }
} }
@ -2645,9 +2648,10 @@ class World implements ChunkManager{
$pos = $this->entityLastKnownPositions[$entity->getId()]; $pos = $this->entityLastKnownPositions[$entity->getId()];
$chunkHash = World::chunkHash($pos->getFloorX() >> Chunk::COORD_BIT_SIZE, $pos->getFloorZ() >> Chunk::COORD_BIT_SIZE); $chunkHash = World::chunkHash($pos->getFloorX() >> Chunk::COORD_BIT_SIZE, $pos->getFloorZ() >> Chunk::COORD_BIT_SIZE);
if(isset($this->entitiesByChunk[$chunkHash][$entity->getId()])){ if(isset($this->entitiesByChunk[$chunkHash][$entity->getId()])){
unset($this->entitiesByChunk[$chunkHash][$entity->getId()]); if(count($this->entitiesByChunk[$chunkHash]) === 1){
if(count($this->entitiesByChunk[$chunkHash]) === 0){
unset($this->entitiesByChunk[$chunkHash]); unset($this->entitiesByChunk[$chunkHash]);
}else{
unset($this->entitiesByChunk[$chunkHash][$entity->getId()]);
} }
} }
unset($this->entityLastKnownPositions[$entity->getId()]); unset($this->entityLastKnownPositions[$entity->getId()]);
@ -2680,9 +2684,10 @@ class World implements ChunkManager{
if($oldChunkX !== $newChunkX || $oldChunkZ !== $newChunkZ){ if($oldChunkX !== $newChunkX || $oldChunkZ !== $newChunkZ){
$oldChunkHash = World::chunkHash($oldChunkX, $oldChunkZ); $oldChunkHash = World::chunkHash($oldChunkX, $oldChunkZ);
if(isset($this->entitiesByChunk[$oldChunkHash][$entity->getId()])){ if(isset($this->entitiesByChunk[$oldChunkHash][$entity->getId()])){
unset($this->entitiesByChunk[$oldChunkHash][$entity->getId()]); if(count($this->entitiesByChunk[$oldChunkHash]) === 1){
if(count($this->entitiesByChunk[$oldChunkHash]) === 0){
unset($this->entitiesByChunk[$oldChunkHash]); unset($this->entitiesByChunk[$oldChunkHash]);
}else{
unset($this->entitiesByChunk[$oldChunkHash][$entity->getId()]);
} }
} }