Skip to content

fix: threadlocal memory leak in yaml configuration loader #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zml2008 merged 2 commits into from
Jun 1, 2025
Merged

fix: threadlocal memory leak in yaml configuration loader #565

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5d0211
fix: threadlocal memory leak in yaml configuration loader
NoahvdAa Mar 19, 2025
993a75f
chore(yaml): resolve style violations
zml2008 Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions format/yaml/src/main/java/org/spongepowered/configurate/yaml/YamlConfigurationLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,29 +187,31 @@ public YamlConfigurationLoader build() {
}
}

private final ThreadLocal<Yaml> yaml;
private final LoaderOptions loaderOpts;
private final DumperOptions dumperOpts;

private YamlConfigurationLoader(final Builder builder) {
super(builder, new CommentHandler[] {CommentHandlers.HASH});
final LoaderOptions loaderOpts = new LoaderOptions()
this.loaderOpts = new LoaderOptions()
.setAcceptTabs(true)
.setProcessComments(false);
loaderOpts.setCodePointLimit(Integer.MAX_VALUE);
this.loaderOpts.setCodePointLimit(Integer.MAX_VALUE);

final DumperOptions opts = builder.options;
opts.setDefaultFlowStyle(NodeStyle.asSnakeYaml(builder.optionState().value(Builder.NODE_STYLE)));
opts.setIndent(builder.optionState().value(Builder.INDENT));
this.yaml = ThreadLocal.withInitial(() -> new Yaml(new Constructor(loaderOpts), new Representer(opts), opts, loaderOpts));
this.dumperOpts = builder.options;
this.dumperOpts.setDefaultFlowStyle(NodeStyle.asSnakeYaml(builder.optionState().value(Builder.NODE_STYLE)));
this.dumperOpts.setIndent(builder.optionState().value(Builder.INDENT));
}

@Override
protected void loadInternal(final CommentedConfigurationNode node, final BufferedReader reader) {
node.raw(this.yaml.get().load(reader));
final Yaml yaml = new Yaml(new Constructor(this.loaderOpts), new Representer(this.dumperOpts), this.dumperOpts, this.loaderOpts);
node.raw(yaml.load(reader));
}

@Override
protected void saveInternal(final ConfigurationNode node, final Writer writer) {
this.yaml.get().dump(node.raw(), writer);
final Yaml yaml = new Yaml(new Constructor(this.loaderOpts), new Representer(this.dumperOpts), this.dumperOpts, this.loaderOpts);
yaml.dump(node.raw(), writer);
}

@Override
Expand Down