Fix memory leak in blocking action due to event listener that was nev…

…er removed
bzikarsky · Apr 2, 2018 · f7df57a · f7df57a
1 parent 48123ef
commit f7df57a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Protocol/Participant.php b/src/Protocol/Participant.php
@@ -117,11 +117,9 @@ protected function blockingAction(CommandInterface $command, $eventName, callabl
             function (CommandInterface $sentCommand) use ($deferred, $eventName, $handler) {
                 $successListener = null;
                 $failListener = function () use ($deferred, $eventName, &$successListener) {
-                    $this->connection->removeListener($eventName, $successListener);
                     $deferred->reject(new ConnectionLostException());
                 };
-                $successListener = function (CommandInterface $recvCommand) use ($sentCommand, $deferred, $handler, &$failListener) {
-                    $this->connection->removeListener('close', $failListener);
+                $successListener = function (CommandInterface $recvCommand) use ($sentCommand, $deferred, $handler) {
                     // if the result is not NULL resolve the deferred action with the handler's result
                     // if the result is NULL we assume the handler communicated the result on the passed in deferred
                     // itself
@@ -131,8 +129,12 @@ function (CommandInterface $sentCommand) use ($deferred, $eventName, $handler) {
                         $deferred->resolve($result);
                     }
                 };
-                $this->connection->once('close', $failListener);
-                $this->connection->once($eventName, $successListener);
+                $deferred->promise()->always(function () use ($successListener, $failListener, $eventName) {
+                    $this->connection->removeListener('close', $failListener);
+                    $this->connection->removeListener($eventName, $successListener);
+                });
+                $this->connection->on('close', $failListener);
+                $this->connection->on($eventName, $successListener);
             },
             function ($e) use ($deferred) {
                 $deferred->reject($e);