diff options
Diffstat (limited to 'patches/server/0596-Throw-proper-exception-on-empty-JsonList-file.patch')
| -rw-r--r-- | patches/server/0596-Throw-proper-exception-on-empty-JsonList-file.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/patches/server/0596-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0596-Throw-proper-exception-on-empty-JsonList-file.patch new file mode 100644 index 0000000000..e013e32526 --- /dev/null +++ b/patches/server/0596-Throw-proper-exception-on-empty-JsonList-file.patch @@ -0,0 +1,18 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mariell Hoversholm <[email protected]> +Date: Sun, 1 Nov 2020 16:43:11 +0100 +Subject: [PATCH] Throw proper exception on empty JsonList file + + +diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java +index 91899909abd83611ac63633fef701be542cf64bf..4fd709a550bf8da1e996894a1ca6b91206c31e9e 100644 +--- a/src/main/java/net/minecraft/server/players/StoredUserList.java ++++ b/src/main/java/net/minecraft/server/players/StoredUserList.java +@@ -187,6 +187,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> { + + try { + JsonArray jsonarray = (JsonArray) StoredUserList.GSON.fromJson(bufferedreader, JsonArray.class); ++ com.google.common.base.Preconditions.checkState(jsonarray != null, "The file \"" + this.file.getName() + "\" is either empty or corrupt"); // Paper + + this.map.clear(); + Iterator iterator = jsonarray.iterator(); |