Merge pull request #154 from Devolutions/wayk-2430

Wayk 2430: Avoid infinite loop if no data is received for RDP connection
Devolutions · Apr 13, 2021 · b7dc2a9 · b7dc2a9
2 parents 66aa58c + 078783f
commit b7dc2a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This document provides a list of notable changes introduced in Devolutions Gateway by release.
 
+## 2021.1.3 (2021-04-13)
+  * Fix infinite loop issue when the precondition pdu was not completely received
+
 ## 2021.1.2 (2021-03-26)
   * Fix broken Linux container image (missing executable)
   * Add PowerShell module .zip/.nupkg to release artifacts

diff --git a/devolutions-gateway/src/rdp/accept_connection_future.rs b/devolutions-gateway/src/rdp/accept_connection_future.rs
@@ -66,6 +66,14 @@ impl AcceptConnectionFuture {
         ready!(pinned_client.poll_read(cx, &mut read_buf))?;
 
         let read_bytes = read_buf.filled().len();
+
+        if read_bytes == 0 {
+            return Poll::Ready(Err(io::Error::new(
+                io::ErrorKind::UnexpectedEof,
+                "No data to read, EOF has been reached.",
+            )));
+        }
+
         self.buffer.extend_from_slice(&received[..read_bytes]);
 
         if self.buffer.len() > MAX_FUTURE_BUFFER_SIZE {