mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-14 22:01:59 +00:00
Code Issues Projects Releases Wiki Activity

AsyncTask: fixed reentrancy bug tested by f8e6f036affaaca135103556bd2c7f15a943d29b

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-07-01 13:27:32 +01:00
parent f8e6f036af
commit 70dd9c7371
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scheduler/AsyncTask.php
View File

@ -252,9 +252,15 @@ abstract class AsyncTask extends \Threaded{
final public function __destruct(){ final public function __destruct(){
$this->reallyDestruct(); $this->reallyDestruct();
if(self::$threadLocalStorage !== null && isset(self::$threadLocalStorage[$h = spl_object_id($this)])){ if(self::$threadLocalStorage !== null && isset(self::$threadLocalStorage[$h = spl_object_id($this)])){
unset(self::$threadLocalStorage[$h]); //Beware changing this code!
if(self::$threadLocalStorage->count() === 0){ //This code may cause the GC to be triggered, causing destruction of other AsyncTasks (which may or may not
//have been indirectly referenced by the TLS).
//This may cause the code to be re-entered from a different context unexpectedly, causing a crash if handled
//incorrectly.
if(self::$threadLocalStorage->count() === 1){
self::$threadLocalStorage = null; self::$threadLocalStorage = null;
}else{
unset(self::$threadLocalStorage[$h]);
} }
} }
} }