Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 06:20:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

UIDefaultsLoader: check for endless recursion in parsing color functions (e.g. abc = darken($abc,10%))

Browse Source
This commit is contained in:
Karl Tauber
2021-02-05 23:30:48 +01:00
parent 5ccd92ece6
commit b631bcc0db
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,8 @@ class UIDefaultsLoader
private static final String OPTIONAL_PREFIX = "?"; private static final String OPTIONAL_PREFIX = "?";
private static final String WILDCARD_PREFIX = "*."; private static final String WILDCARD_PREFIX = "*.";
private static int parseColorDepth;
static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, List<FlatDefaultsAddon> addons, static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, List<FlatDefaultsAddon> addons,
Properties additionalDefaults, boolean dark, UIDefaults defaults ) Properties additionalDefaults, boolean dark, UIDefaults defaults )
{ {
@@ -580,19 +582,27 @@ class UIDefaultsLoader
if( params.isEmpty() ) if( params.isEmpty() )
throw new IllegalArgumentException( "missing parameters in function '" + value + "'" ); throw new IllegalArgumentException( "missing parameters in function '" + value + "'" );
switch( function ) { if( parseColorDepth > 100 )
case "rgb": return parseColorRgbOrRgba( false, params, resolver, reportError ); throw new IllegalArgumentException( "endless recursion in color function '" + value + "'" );
case "rgba": return parseColorRgbOrRgba( true, params, resolver, reportError );
case "hsl": return parseColorHslOrHsla( false, params ); parseColorDepth++;
case "hsla": return parseColorHslOrHsla( true, params ); try {
case "lighten": return parseColorHSLIncreaseDecrease( 2, true, params, resolver, reportError ); switch( function ) {
case "darken": return parseColorHSLIncreaseDecrease( 2, false, params, resolver, reportError ); case "rgb": return parseColorRgbOrRgba( false, params, resolver, reportError );
case "saturate": return parseColorHSLIncreaseDecrease( 1, true, params, resolver, reportError ); case "rgba": return parseColorRgbOrRgba( true, params, resolver, reportError );
case "desaturate": return parseColorHSLIncreaseDecrease( 1, false, params, resolver, reportError ); case "hsl": return parseColorHslOrHsla( false, params );
case "fadein": return parseColorHSLIncreaseDecrease( 3, true, params, resolver, reportError ); case "hsla": return parseColorHslOrHsla( true, params );
case "fadeout": return parseColorHSLIncreaseDecrease( 3, false, params, resolver, reportError ); case "lighten": return parseColorHSLIncreaseDecrease( 2, true, params, resolver, reportError );
case "fade": return parseColorFade( params, resolver, reportError ); case "darken": return parseColorHSLIncreaseDecrease( 2, false, params, resolver, reportError );
case "spin": return parseColorSpin( params, resolver, reportError ); case "saturate": return parseColorHSLIncreaseDecrease( 1, true, params, resolver, reportError );
case "desaturate": return parseColorHSLIncreaseDecrease( 1, false, params, resolver, reportError );
case "fadein": return parseColorHSLIncreaseDecrease( 3, true, params, resolver, reportError );
case "fadeout": return parseColorHSLIncreaseDecrease( 3, false, params, resolver, reportError );
case "fade": return parseColorFade( params, resolver, reportError );
case "spin": return parseColorSpin( params, resolver, reportError );
}
} finally {
parseColorDepth--;
} }
throw new IllegalArgumentException( "unknown color function '" + value + "'" ); throw new IllegalArgumentException( "unknown color function '" + value + "'" );