Skip to content

Commit

Permalink
Updated Upstream (BungeeCord)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
0925c06f #3563: Correct max string length for reading SystemChat packets
  • Loading branch information
electronicboy committed Nov 15, 2023
1 parent 50f0a75 commit 8d63c61
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7edb3d8862d8e76629943d7e5cddcfb86a745434 Mon Sep 17 00:00:00 2001
From 8841640a739548c333344a4abdff6a2d8239c019 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 25 Nov 2019 19:54:06 +0000
Subject: [PATCH] Speed up some common exceptions
Expand Down Expand Up @@ -67,7 +67,7 @@ index 6c0ef4df..f20104a2 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index ad7f9c25..5cf0d5b7 100644
index d7d5d849..1fdf7053 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -27,6 +27,9 @@ import se.llbit.nbt.Tag;
Expand All @@ -80,7 +80,7 @@ index ad7f9c25..5cf0d5b7 100644
public static void writeString(String s, ByteBuf buf)
{
writeString( s, buf, Short.MAX_VALUE );
@@ -201,13 +204,18 @@ public abstract class DefinedPacket
@@ -206,13 +209,18 @@ public abstract class DefinedPacket
byte in;
while ( true )
{
Expand Down
6 changes: 3 additions & 3 deletions BungeeCord-Patches/0055-Additional-DoS-mitigations.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From af84573e0b63459feb9994b969276a9f0bbad09c Mon Sep 17 00:00:00 2001
From 55d33b55acd0b62aa1afed32c926229200ae9e42 Mon Sep 17 00:00:00 2001
From: "Five (Xer)" <admin@fivepb.me>
Date: Sat, 30 Jan 2021 18:04:14 +0100
Subject: [PATCH] Additional DoS mitigations
Expand All @@ -8,7 +8,7 @@ Courtesy of Tux and the Velocity Contributors. See:
https://github.com/VelocityPowered/Velocity/commit/5ceac16a821ea35572ff11412ace8929fd06e278

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index 5cf0d5b7..52c2d940 100644
index 1fdf7053..aac03774 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -62,6 +62,7 @@ public abstract class DefinedPacket
Expand All @@ -27,7 +27,7 @@ index 5cf0d5b7..52c2d940 100644
throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
}

@@ -494,4 +496,21 @@ public abstract class DefinedPacket
@@ -499,4 +501,21 @@ public abstract class DefinedPacket

@Override
public abstract String toString();
Expand Down

0 comments on commit 8d63c61

Please sign in to comment.