28 lines
1.7 KiB
Diff
28 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: mbax <matt@phozop.net>
|
||
|
|
Date: Mon, 17 Aug 2020 12:17:37 -0400
|
||
|
|
Subject: [PATCH] Fix regex mistake in CB NBT int deserialization
|
||
|
|
|
||
|
|
The existing regex is too open and allows for the absence of any actual
|
||
|
|
number data, detecting an NBT entry of just the letter "i" in upper or
|
||
|
|
lower case. This causes a single-character NBT entry to be processed as
|
||
|
|
an integer ending in "i", passing an empty String to to Integer.parseInt,
|
||
|
|
triggering an exception in loading the item.
|
||
|
|
|
||
|
|
This commit forces numbers to be present prior to the ending "i"
|
||
|
|
letter.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java b/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java
|
||
|
|
index 94d46bc56b3bc4c4750fcfb1732eea0e49a04195..8ec09ff3b5aae4267b753bd715f0a9d4ef0381bd 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftNBTTagConfigSerializer.java
|
||
|
|
@@ -19,7 +19,7 @@ import net.minecraft.nbt.TagParser;
|
||
|
|
public class CraftNBTTagConfigSerializer {
|
||
|
|
|
||
|
|
private static final Pattern ARRAY = Pattern.compile("^\\[.*]");
|
||
|
|
- private static final Pattern INTEGER = Pattern.compile("[-+]?(?:0|[1-9][0-9]*)?i", Pattern.CASE_INSENSITIVE);
|
||
|
|
+ private static final Pattern INTEGER = Pattern.compile("[-+]?(?:0|[1-9][0-9]*)i", Pattern.CASE_INSENSITIVE); // Paper - fix regex
|
||
|
|
private static final Pattern DOUBLE = Pattern.compile("[-+]?(?:[0-9]+[.]?|[0-9]*[.][0-9]+)(?:e[-+]?[0-9]+)?d", Pattern.CASE_INSENSITIVE);
|
||
|
|
private static final TagParser MOJANGSON_PARSER = new TagParser(new StringReader(""));
|
||
|
|
|