mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-18 09:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Prevent undefined behaviour when accessing async worker thread-store from outside the worker itself

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-10-08 13:01:12 +01:00
parent a0f3c03b50
commit 24677e1d79
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/scheduler/AsyncWorker.php
View File

@ -90,6 +90,9 @@ class AsyncWorker extends Worker{
* @param mixed $value * @param mixed $value
*/ */
public function saveToThreadStore(string $identifier, $value) : void{ public function saveToThreadStore(string $identifier, $value) : void{
if(\Thread::getCurrentThread() !== $this){
throw new \InvalidStateException("Thread-local data can only be stored in the thread context");
}
self::$store[$identifier] = $value; self::$store[$identifier] = $value;
} }
@ -105,6 +108,9 @@ class AsyncWorker extends Worker{
* @return mixed * @return mixed
*/ */
public function getFromThreadStore(string $identifier){ public function getFromThreadStore(string $identifier){
if(\Thread::getCurrentThread() !== $this){
throw new \InvalidStateException("Thread-local data can only be fetched in the thread context");
}
return self::$store[$identifier] ?? null; return self::$store[$identifier] ?? null;
} }
@ -114,6 +120,9 @@ class AsyncWorker extends Worker{
* @param string $identifier * @param string $identifier
*/ */
public function removeFromThreadStore(string $identifier) : void{ public function removeFromThreadStore(string $identifier) : void{
if(\Thread::getCurrentThread() !== $this){
throw new \InvalidStateException("Thread-local data can only be removed in the thread context");
}
unset(self::$store[$identifier]); unset(self::$store[$identifier]);
} }
} }