github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-02-05 17:10:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #701 from lightbend/fix-stack-overflow-in-resolve-context

Browse Source 
Remove unmodifiable collection wrappers in ResolveContext
This commit is contained in:
Havoc Pennington 2020-09-18 08:18:39 -04:00 committed by GitHub
commit 001e6c3b82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/src/main/java/com/typesafe/config/impl/ResolveContext.java
View File

@ -32,8 +32,12 @@ final class ResolveContext {
this.memos = memos; this.memos = memos;
this.options = options; this.options = options;
this.restrictToChild = restrictToChild; this.restrictToChild = restrictToChild;
this.resolveStack = Collections.unmodifiableList(resolveStack); // we don't defensively copy/wrap these because Collections.unmodifiableList etc.
this.cycleMarkers = Collections.unmodifiableSet(cycleMarkers); // nest infinitely in a way that causes stack overflow (they don't check to avoid
// multiple wrappers). But they should be treated as immutable because they end
// up shared between multiple ResolveContext.
this.resolveStack = resolveStack;
this.cycleMarkers = cycleMarkers;
} }
private static Set<AbstractConfigValue> newCycleMarkers() { private static Set<AbstractConfigValue> newCycleMarkers() {