From 472c20e5e9b6c63367dc8df871ad22185c716327 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Fri, 12 Oct 2018 17:59:12 +0200 Subject: [PATCH 1/3] critical bug in HPacket.structureEquals() --- src/main/protocol/HPacket.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/protocol/HPacket.java b/src/main/protocol/HPacket.java index 24a5fda..2d3e4c3 100644 --- a/src/main/protocol/HPacket.java +++ b/src/main/protocol/HPacket.java @@ -197,7 +197,7 @@ public class HPacket implements StringifyAble { String s = split[i]; if (s.equals("s")) { - if (readUshort(readIndex) + 2 + readIndex > getBytesLength()) return false; + if (readIndex + 2 > getBytesLength() || readUshort(readIndex) + 2 + readIndex > getBytesLength()) return false; readString(); } else if (s.equals("i")) { @@ -840,5 +840,9 @@ public class HPacket implements StringifyAble { } public static void main(String[] args) { + HPacket packet = new HPacket("{l}{u:1442}"); + + System.out.println(packet.structureEquals("s,b")); + } } \ No newline at end of file From 2f0b97d537c8daba84dabe6848c15e6af8f0e86f Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Fri, 12 Oct 2018 18:03:12 +0200 Subject: [PATCH 2/3] support for hotels with no support for optional clientside encryption --- src/main/protocol/packethandler/IncomingHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/protocol/packethandler/IncomingHandler.java b/src/main/protocol/packethandler/IncomingHandler.java index a6198e5..56b7d8d 100644 --- a/src/main/protocol/packethandler/IncomingHandler.java +++ b/src/main/protocol/packethandler/IncomingHandler.java @@ -22,6 +22,9 @@ public class IncomingHandler extends Handler { packet.readString(); isEncryptedStream = packet.readBoolean(); } + else if (message.getIndex() > 5) { + ((List)listeners[0]).remove(this); + } } }; From feadc99024f00f50e3d169b3f2d1c7957805aa27 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Fri, 12 Oct 2018 18:05:03 +0200 Subject: [PATCH 3/3] thing --- src/main/protocol/packethandler/IncomingHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/protocol/packethandler/IncomingHandler.java b/src/main/protocol/packethandler/IncomingHandler.java index 56b7d8d..f0d0bdc 100644 --- a/src/main/protocol/packethandler/IncomingHandler.java +++ b/src/main/protocol/packethandler/IncomingHandler.java @@ -22,7 +22,7 @@ public class IncomingHandler extends Handler { packet.readString(); isEncryptedStream = packet.readBoolean(); } - else if (message.getIndex() > 5) { + else if (message.getIndex() > 3) { ((List)listeners[0]).remove(this); } }