mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-03-07 13:48:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use SnakeYaml 1.32+, set loader code point limit. (#2194)

Browse Source 
Defaults to 64MB, can be set via -Dworldedit.yaml.codePointLimit sysprop.

Fixes #2193, EngineHub/WorldGuard#1953.
This commit is contained in:
wizjany 2022-09-26 17:33:57 -04:00 committed by GitHub
parent 7e61ff19ca
commit 0ef38b5292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-core/build.gradle.kts
View File

@ -29,7 +29,7 @@
dependencies {
constraints {
"implementation"( "org.yaml:snakeyaml") {
version { require("1.26") }
version { require("1.33") }
because("Bukkit provides SnakeYaml")
}
}
@ -37,7 +37,7 @@
"api"(project(":worldedit-libs:core"))
"compileOnly"("de.schlichtherle:truezip:6.8.4")
"implementation"("org.mozilla:rhino-runtime:1.7.13")
"implementation"("org.yaml:snakeyaml:1.26")
"implementation"("org.yaml:snakeyaml:1.33")
"implementation"("com.google.guava:guava")
"compileOnlyApi"("com.google.code.findbugs:jsr305:1.3.9")
"implementation"("com.google.code.gson:gson")

17
worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java
View File

@ -21,6 +21,7 @@
import com.sk89q.util.StringUtil;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.nodes.Tag;
@ -89,13 +90,21 @@ public YAMLProcessor(File file, boolean writeDefaults, YAMLFormat format) {
super(new LinkedHashMap<>(), writeDefaults);
this.format = format;
DumperOptions options = new DumperOptions();
options.setIndent(4);
options.setDefaultFlowStyle(format.getStyle());
DumperOptions dumperOptions = new DumperOptions();
dumperOptions.setIndent(4);
dumperOptions.setDefaultFlowStyle(format.getStyle());
Representer representer = new FancyRepresenter();
representer.setDefaultFlowStyle(format.getStyle());
LoaderOptions loaderOptions = new LoaderOptions();
try {
// 64 MB default
int yamlCodePointLimit = Integer.getInteger("worldedit.yaml.codePointLimit", 64 * 1024 * 1024);
loaderOptions.setCodePointLimit(yamlCodePointLimit);
} catch (NoSuchMethodError ignored) {
// pre-1.32 snakeyaml
}
yaml = new Yaml(new SafeConstructor(), representer, options);
yaml = new Yaml(new SafeConstructor(), representer, dumperOptions, loaderOptions);
this.file = file;
}