From 764a1c661cbaad5fac6d06862d36a0d4fdd1d913 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Sat, 15 Sep 2018 14:38:42 +0300
Subject: [PATCH] Fixed a possible buffer memory leak in GeolocationCache on
 first enable

http://www.evanjones.ca/java-native-leak-bug.html
"TL;DR: Always close GZIPInputStream and GZIPOutputStream since they use
native memory via zlib."
---
 .../djrapitops/plan/system/cache/GeolocationCache.java   | 9 +++++++--
 .../plan/system/webserver/response/Response.java         | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/system/cache/GeolocationCache.java b/Plan/src/main/java/com/djrapitops/plan/system/cache/GeolocationCache.java
index 3e7a752dc..0dbe32cb0 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/cache/GeolocationCache.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/cache/GeolocationCache.java
@@ -16,6 +16,7 @@ import com.maxmind.geoip2.record.Country;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.UnknownHostException;
@@ -147,8 +148,12 @@ public class GeolocationCache implements SubSystem {
             return;
         }
         URL downloadSite = new URL("http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz");
-        try (ReadableByteChannel rbc = Channels.newChannel(new GZIPInputStream(downloadSite.openStream()));
-             FileOutputStream fos = new FileOutputStream(getInstance().geolocationDB.getAbsoluteFile())) {
+        try (
+                InputStream in = downloadSite.openStream();
+                GZIPInputStream gzipIn = new GZIPInputStream(in);
+                ReadableByteChannel rbc = Channels.newChannel(gzipIn);
+                FileOutputStream fos = new FileOutputStream(getInstance().geolocationDB.getAbsoluteFile())
+        ) {
             fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
         }
     }
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/Response.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/Response.java
index 0456b76ba..349a209c4 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/Response.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/Response.java
@@ -92,8 +92,10 @@ public abstract class Response {
                 ? getContent()
                 : locale.replaceMatchingLanguage(getContent());
 
-        try (GZIPOutputStream out = new GZIPOutputStream(exchange.getResponseBody());
-             ByteArrayInputStream bis = new ByteArrayInputStream(sentContent.getBytes(StandardCharsets.UTF_8))) {
+        try (
+                GZIPOutputStream out = new GZIPOutputStream(exchange.getResponseBody());
+                ByteArrayInputStream bis = new ByteArrayInputStream(sentContent.getBytes(StandardCharsets.UTF_8))
+        ) {
             byte[] buffer = new byte[2048];
             int count;
             while ((count = bis.read(buffer)) != -1) {