From: Samuel Sieb <samuel@sieb.net>
Date: Thu, 24 Sep 2015 17:37:21 +0000 (-0700)
Subject: Don't fail the redirect if padding wasn't sent before disconnecting
X-Git-Tag: 2.0.0-beta1+android10~418^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=812e14af04ba0ad073a5d9224eb367e8ed052236;p=platform%2Fupstream%2Ffreerdp.git

Don't fail the redirect if padding wasn't sent before disconnecting
---

diff --git a/libfreerdp/core/redirection.c b/libfreerdp/core/redirection.c
index f908589..6d31257 100644
--- a/libfreerdp/core/redirection.c
+++ b/libfreerdp/core/redirection.c
@@ -359,8 +359,11 @@ BOOL rdp_recv_server_redirection_pdu(rdpRdp* rdp, wStream* s)
 		}
 	}
 
-	if (!Stream_SafeSeek(s, 8)) /* pad (8 bytes) */
-		return -1;
+	if (Stream_GetRemainingLength(s) >= 8)
+	{
+		/* some versions of windows don't included this padding before closing the connection */
+		Stream_Seek(s, 8); /* pad (8 bytes) */
+	}
 
 	if (redirection->flags & LB_NOREDIRECT)
 		return 0;