From a2fb242814e05fe36afc851c2e6c392b8f954fb0 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Sun, 19 Nov 2017 19:35:59 +0000 Subject: [PATCH] Fix server icon response leaking buffer (MC-122085) (#4534) --- .../net/minecraft/server/MinecraftServer.java.patch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index e524e153c5..188649ef54 100644 --- a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -116,7 +116,7 @@ catch (Throwable throwable1) { field_147145_h.error("Encountered an unexpected exception", throwable1); -@@ -536,14 +567,15 @@ +@@ -536,13 +567,13 @@ field_147145_h.error("We were unable to save this crash report to disk."); } @@ -131,8 +131,7 @@ this.func_71260_j(); } catch (Throwable throwable) - { -@@ -551,6 +583,8 @@ +@@ -551,6 +582,8 @@ } finally { @@ -141,6 +140,14 @@ this.func_71240_o(); } } +@@ -577,6 +610,7 @@ + ImageIO.write(bufferedimage, "PNG", new ByteBufOutputStream(bytebuf)); + ByteBuf bytebuf1 = Base64.encode(bytebuf); + p_184107_1_.func_151320_a("data:image/png;base64," + bytebuf1.toString(StandardCharsets.UTF_8)); ++ bytebuf1.release(); // Forge: fix MC-122085 + } + catch (Exception exception) + { @@ -618,6 +652,7 @@ public void func_71217_p() {