Fix suspended fiber reference being null during destruction

revoltphp · Mar 4, 2022 · 0ea6f60 · 0ea6f60
1 parent 13ca2ba
commit 0ea6f60
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/EventLoop/Internal/DriverSuspension.php b/src/EventLoop/Internal/DriverSuspension.php
@@ -55,8 +55,11 @@ public function resume(mixed $value = null): void
 
         $this->pending = false;
 
-        if ($this->suspendedFiber) {
-            ($this->queue)(\Closure::fromCallable([$this->suspendedFiber, 'resume']), $value);
+        /** @var \Fiber|null $fiber */
+        $fiber = $this->fiberRef?->get();
+
+        if ($fiber) {
+            ($this->queue)(\Closure::fromCallable([$fiber, 'resume']), $value);
         } else {
             // Suspend event loop fiber to {main}.
             ($this->interrupt)(static fn () => $value);
@@ -132,8 +135,11 @@ public function throw(\Throwable $throwable): void
 
         $this->pending = false;
 
-        if ($this->suspendedFiber) {
-            ($this->queue)(\Closure::fromCallable([$this->suspendedFiber, 'throw']), $throwable);
+        /** @var \Fiber|null $fiber */
+        $fiber = $this->fiberRef?->get();
+
+        if ($fiber) {
+            ($this->queue)(\Closure::fromCallable([$fiber, 'throw']), $throwable);
         } else {
             // Suspend event loop fiber to {main}.
             ($this->interrupt)(static fn () => throw $throwable);