From eecf02b2a4c470af1cb418043c5bc3fc212f9a13 Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Mon, 24 Apr 2023 07:23:58 +0000
Subject: [PATCH] 1

---
 server/wsproxy/kcpsession.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/wsproxy/kcpsession.cc b/server/wsproxy/kcpsession.cc
index 50126ba..fc41b91 100644
--- a/server/wsproxy/kcpsession.cc
+++ b/server/wsproxy/kcpsession.cc
@@ -85,10 +85,10 @@ void KcpSession::DecodeUserPacket(char* buf, int& offset, unsigned int buflen)
     //packagelen + msgid + magiccode + msgbody
     //2 + 2 + 4+ xx + \0 + xx
     bool warning = false;
-    while (buflen - offset >= sizeof(f8::PackHead)) {
-        f8::PackHead* p = (f8::PackHead*)&buf[offset];
+    while (buflen - offset >= sizeof(f8::PackHead) + GetSecretKeyLen()) {
+        f8::PackHead* p = (f8::PackHead*)&buf[offset + GetSecretKeyLen()];
         if (p->magic_code == f8::MAGIC_CODE) {
-            if (buflen - offset < sizeof(f8::PackHead) + p->packlen) {
+            if (buflen - offset < sizeof(f8::PackHead) + p->packlen + GetSecretKeyLen()) {
                 break;
             }
             //a8::XPrintf("Recv MsgId:%d\n", {p->msgid});
@@ -98,7 +98,7 @@ void KcpSession::DecodeUserPacket(char* buf, int& offset, unsigned int buflen)
                                           //saddr,
                                           p->msgid,
                                           p->seqid,
-                                          &buf[offset + sizeof(f8::PackHead)],
+                                          &buf[offset + sizeof(f8::PackHead) + GetSecretKeyLen()],
                                           p->packlen);
             offset += sizeof(f8::PackHead) + p->packlen;
         } else {