Paper/CraftBukkit-Patches/0127-Safer-JSON-Loading.patch

48 lines
2.1 KiB
Diff
Raw Normal View History

From 746d08b447fa46f08a994ba4f1491f49786c01ef 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
2015-02-28 12:36:22 +01:00
index f5c3aae..8e4ecfd 100644
--- a/src/main/java/net/minecraft/server/JsonList.java
+++ b/src/main/java/net/minecraft/server/JsonList.java
2015-02-28 12:36:22 +01:00
@@ -170,6 +170,17 @@ public class JsonList<K, V extends JsonListEntry<K>> {
try {
bufferedreader = Files.newReader(this.c, Charsets.UTF_8);
2014-11-28 02:17:45 +01:00
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 );
2014-11-28 02:17:45 +01:00
+ } 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 85277a6..0f82e06 100644
--- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java
2015-05-09 22:23:26 +02:00
@@ -199,6 +199,11 @@ public class UserCache {
}
2015-05-09 22:23:26 +02:00
} 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
} catch (JsonParseException jsonparseexception) {
;
} finally {
--
2015-05-09 22:23:26 +02:00
2.1.4