Prevent exception inside handleDisconnect() and handleError()

xp-forge · Jan 12, 2025 · ebfb5dd · ebfb5dd
1 parent 274bc84
commit ebfb5dd
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/php/xp/web/srv/Protocol.class.php b/src/main/php/xp/web/srv/Protocol.class.php
@@ -80,9 +80,10 @@ public function handleData($socket) {
    */
   public function handleDisconnect($socket) {
     $handle= spl_object_id($socket);
-    $this->protocols[$handle]->handleDisconnect($socket);
-
-    unset($this->protocols[$handle]);
+    if (isset($this->protocols[$handle])) {
+      $this->protocols[$handle]->handleDisconnect($socket);
+      unset($this->protocols[$handle]);
+    }
     $socket->close();
   }
 
@@ -94,9 +95,10 @@ public function handleDisconnect($socket) {
    */
   public function handleError($socket, $e) {
     $handle= spl_object_id($socket);
-    $this->protocols[$handle]->handleError($socket, $e);
-
-    unset($this->protocols[$handle]);
+    if (isset($this->protocols[$handle])) {
+      $this->protocols[$handle]->handleError($socket, $e);
+      unset($this->protocols[$handle]);
+    }
     $socket->close();
   }
 }