aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-15 03:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2109 from peppy/sprite-text-fallback

Browse Source 
Avoid potential stack overflow in SpriteText fallback logic
This commit is contained in:
Dan Balasescu
2019-01-23 16:08:57 +09:00
committed by GitHub
parent b695b4d5ba 1d44b551fa
commit 6a2ab3df3a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Framework/Graphics/Sprites/SpriteText.cs
View File

@@ -61,13 +61,13 @@ namespace osu.Framework.Graphics.Sprites
invalidate(true);
}, true);
spaceWidth = GetTextureForCharacter('.')?.DisplayWidth * 2 ?? 1;
spaceWidth = getTextureForCharacter('.')?.DisplayWidth * 2 ?? 1;
sharedData.TextureShader = shaders?.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE);
sharedData.RoundedTextureShader = shaders?.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
// Pre-cache the characters in the texture store
foreach (var character in displayedText)
GetTextureForCharacter(character);
getTextureForCharacter(character);
}
private LocalisedString text = string.Empty;
@@ -423,7 +423,7 @@ namespace osu.Framework.Graphics.Sprites
}
else
{
texture = GetTextureForCharacter(character);
texture = getTextureForCharacter(character);
textureSize = texture == null ? new Vector2(useFixedWidth ? constantWidth : spaceWidth) : new Vector2(texture.DisplayWidth, texture.DisplayHeight);
}
@@ -512,7 +512,7 @@ namespace osu.Framework.Graphics.Sprites
}
private Cached<float> constantWidthCache;
private float constantWidth => constantWidthCache.IsValid ? constantWidthCache.Value : constantWidthCache.Value = GetTextureForCharacter('D')?.DisplayWidth ?? 0;
private float constantWidth => constantWidthCache.IsValid ? constantWidthCache.Value : constantWidthCache.Value = getTextureForCharacter('D')?.DisplayWidth ?? 0;
private Cached<Vector2> shadowOffsetCache;
private Vector2 shadowOffset => shadowOffsetCache.IsValid ? shadowOffsetCache.Value : shadowOffsetCache.Value = ToScreenSpace(shadow_offset * TextSize) - ToScreenSpace(Vector2.Zero);
@@ -582,6 +582,8 @@ namespace osu.Framework.Graphics.Sprites
#endregion
private Texture getTextureForCharacter(char c) => GetTextureForCharacter(c) ?? GetFallbackTextureForCharacter(c);
/// <summary>
/// Gets the texture for the given character.
/// </summary>
@@ -592,7 +594,7 @@ namespace osu.Framework.Graphics.Sprites
if (store == null)
return null;
return store.GetCharacter(Font, c) ?? store.GetCharacter(null, c) ?? GetFallbackTextureForCharacter(c);
return store.GetCharacter(Font, c) ?? store.GetCharacter(null, c);
}
/// <summary>