geforkt von Mirrors/Paper
19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
48 Zeilen
2.1 KiB
Diff
48 Zeilen
2.1 KiB
Diff
From f3edd8e4f0b1fb7cec4651daf41dd10e47822208 Mon Sep 17 00:00:00 2001
|
|
From: Suddenly <suddenly@suddenly.coffee>
|
|
Date: Tue, 8 Jul 2014 09:44:18 +1000
|
|
Subject: [PATCH] Safer JSON Loading
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
|
|
index 61c676a..af2e2d1 100644
|
|
--- a/src/main/java/net/minecraft/server/JsonList.java
|
|
+++ b/src/main/java/net/minecraft/server/JsonList.java
|
|
@@ -149,6 +149,17 @@ public class JsonList {
|
|
try {
|
|
bufferedreader = Files.newReader(this.c, Charsets.UTF_8);
|
|
collection = (Collection) this.b.fromJson(bufferedreader, JsonList.f);
|
|
+ // Spigot Start
|
|
+ } catch ( java.io.FileNotFoundException ex )
|
|
+ {
|
|
+ org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.INFO, "Unable to find file {0}, creating it.", this.c );
|
|
+ } catch ( com.google.gson.JsonSyntaxException ex )
|
|
+ {
|
|
+ org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.WARNING, "Unable to read file {0}, backing it up to {0}.backup and creating new copy.", this.c );
|
|
+ File backup = new File( this.c + ".backup" );
|
|
+ this.c.renameTo( backup );
|
|
+ this.c.delete();
|
|
+ // Spigot End
|
|
} finally {
|
|
IOUtils.closeQuietly(bufferedreader);
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
|
|
index 03abfbd..bd35a0f 100644
|
|
--- a/src/main/java/net/minecraft/server/UserCache.java
|
|
+++ b/src/main/java/net/minecraft/server/UserCache.java
|
|
@@ -160,6 +160,11 @@ public class UserCache {
|
|
break label64;
|
|
} catch (FileNotFoundException filenotfoundexception) {
|
|
;
|
|
+ // Spigot Start
|
|
+ } catch (com.google.gson.JsonSyntaxException ex) {
|
|
+ JsonList.a.warn( "Usercache.json is corrupted or has bad formatting. Deleting it to prevent further issues." );
|
|
+ this.g.delete();
|
|
+ // Spigot End
|
|
} finally {
|
|
IOUtils.closeQuietly(bufferedreader);
|
|
}
|
|
--
|
|
2.1.0
|
|
|