From 0a6d32041074f9da46b8e7366ae6cfb838f930b4 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 26 Aug 2021 12:25:23 +0200 Subject: [PATCH] Sanitize ResourceLocation error logging (#6495) --- ...itize-resourcelocation-error-logging.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/server/0763-Sanitize-resourcelocation-error-logging.patch diff --git a/patches/server/0763-Sanitize-resourcelocation-error-logging.patch b/patches/server/0763-Sanitize-resourcelocation-error-logging.patch new file mode 100644 index 0000000000..1f990a622a --- /dev/null +++ b/patches/server/0763-Sanitize-resourcelocation-error-logging.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: kennytv +Date: Thu, 26 Aug 2021 12:09:47 +0200 +Subject: [PATCH] Sanitize ResourceLocation error logging + + +diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java +index bf78cfc3b577e256ae68f219224447531619abd6..6e5d13e63c97cb95b93af1d997dc0eb53f966566 100644 +--- a/src/main/java/net/minecraft/resources/ResourceLocation.java ++++ b/src/main/java/net/minecraft/resources/ResourceLocation.java +@@ -32,9 +32,9 @@ public class ResourceLocation implements Comparable { + this.namespace = StringUtils.isEmpty(id[0]) ? "minecraft" : id[0]; + this.path = id[1]; + if (!isValidNamespace(this.namespace)) { +- throw new ResourceLocationException("Non [a-z0-9_.-] character in namespace of location: " + this.namespace + ":" + this.path); ++ throw new ResourceLocationException("Non [a-z0-9_.-] character in namespace of location: " + org.apache.commons.lang3.StringUtils.normalizeSpace(this.namespace) + ":" + org.apache.commons.lang3.StringUtils.normalizeSpace(this.path)); // Paper + } else if (!isValidPath(this.path)) { +- throw new ResourceLocationException("Non [a-z0-9/._-] character in path of location: " + this.namespace + ":" + this.path); ++ throw new ResourceLocationException("Non [a-z0-9/._-] character in path of location: " + this.namespace + ":" + org.apache.commons.lang3.StringUtils.normalizeSpace(this.path)); // Paper + } + } +