From 763f8fab7fab45927c7e4c233b04453e90a0852d Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Wed, 19 May 2021 11:37:22 +0100
Subject: [PATCH] xrdp_rdp_send_data() now works with
 --enable-devel-streamcheck

---
 libxrdp/xrdp_rdp.c | 2 +-
 libxrdp/xrdp_sec.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c
index 1d30f9fc..b8528377 100644
--- a/libxrdp/xrdp_rdp.c
+++ b/libxrdp/xrdp_rdp.c
@@ -611,7 +611,7 @@ xrdp_rdp_send_data(struct xrdp_rdp *self, struct stream *s,
             ls.data = mppc_enc->outputBuffer - (rdp_offset + 18);
             ls.p = ls.data + rdp_offset;
             ls.end = ls.p + clen;
-            ls.size = clen;
+            ls.size = s->end - s->data;
             ls.iso_hdr = ls.data + iso_offset;
             ls.mcs_hdr = ls.data + mcs_offset;
             ls.sec_hdr = ls.data + sec_offset;
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index ffeffbed..8978c0af 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -642,6 +642,10 @@ xrdp_sec_init(struct xrdp_sec *self, struct stream *s)
             s_push_layer(s, sec_hdr, 4);
         }
     }
+    else
+    {
+        s_push_layer(s, sec_hdr, 0);
+    }
 
     return 0;
 }