angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-15 00:07:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

UIDefaultsLoader: check for endless recursion in resolveValue()

Browse Source
This commit is contained in:
Karl Tauber
2020-07-08 17:57:40 +02:00
parent 835faf9773
commit 1b974379c8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
View File

@@ -212,6 +212,7 @@ class UIDefaultsLoader
static String resolveValue( String value, Function<String, String> propertiesGetter ) { static String resolveValue( String value, Function<String, String> propertiesGetter ) {
value = value.trim(); value = value.trim();
String value0 = value;
if( value.startsWith( PROPERTY_PREFIX ) ) if( value.startsWith( PROPERTY_PREFIX ) )
value = value.substring( PROPERTY_PREFIX.length() ); value = value.substring( PROPERTY_PREFIX.length() );
@@ -232,6 +233,9 @@ class UIDefaultsLoader
throw new IllegalArgumentException( "variable or property '" + value + "' not found" ); throw new IllegalArgumentException( "variable or property '" + value + "' not found" );
} }
if( newValue.equals( value0 ) )
throw new IllegalArgumentException( "endless recursion in variable or property '" + value + "'" );
return resolveValue( newValue, propertiesGetter ); return resolveValue( newValue, propertiesGetter );
} }