Prevent infinite loop in ImapProtocol (#316)

* Prevent infinite loop in ImapProtocol * Fix PHP TypeError
Webklex · Mar 1, 2023 · 56c2c51 · 56c2c51
1 parent e108c27
commit 56c2c51
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Connection/Protocols/ImapProtocol.php b/src/Connection/Protocols/ImapProtocol.php
@@ -112,7 +112,7 @@ protected function enableStartTls() {
      */
     public function nextLine(Response $response): string {
         $line = "";
-        while (($next_char = fread($this->stream, 1)) !== false && $next_char !== "\n") {
+        while (($next_char = fread($this->stream, 1)) !== false && !in_array($next_char, ["","\n"])) {
             $line .= $next_char;
         }
         if ($line === "" && $next_char === false) {
@@ -147,7 +147,7 @@ protected function nextTaggedLine(Response $response, ?string &$tag): string {
         $line = $this->nextLine($response);
         list($tag, $line) = explode(' ', $line, 2);
 
-        return $line;
+        return $line ?? '';
     }
 
     /**