StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix index-out-of-range error when StartsWith prefix is empty

This commit is contained in:
Jesse Plamondon-Willard 2022-10-16 14:41:45 -04:00
parent eed1deb3c7
commit 4e3b2810e6
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/SMAPI/Framework/Content/AssetName.cs
View File

@ -139,21 +139,19 @@ namespace StardewModdingAPI.Framework.Content
if (prefix is null) if (prefix is null)
return false; return false;
// get initial values
ReadOnlySpan<char> trimmed = prefix.AsSpan().Trim(); ReadOnlySpan<char> trimmed = prefix.AsSpan().Trim();
if (trimmed.Length == 0)
return true;
ReadOnlySpan<char> pathSeparators = new(ToolkitPathUtilities.PossiblePathSeparators); // just to simplify calling other span APIs
// just because most ReadOnlySpan/Span APIs expect a ReadOnlySpan/Span, easier to read. // asset keys can't have a leading slash, but AssetPathYielder will trim them
ReadOnlySpan<char> pathSeparators = new(ToolkitPathUtilities.PossiblePathSeparators);
// asset keys can't have a leading slash, but AssetPathYielder won't yield that.
if (pathSeparators.Contains(trimmed[0])) if (pathSeparators.Contains(trimmed[0]))
return false; return false;
if (trimmed.Length == 0) // compare segments
return true;
AssetNamePartEnumerator curParts = new(this.Name); AssetNamePartEnumerator curParts = new(this.Name);
AssetNamePartEnumerator prefixParts = new(trimmed); AssetNamePartEnumerator prefixParts = new(trimmed);
while (true) while (true)
{ {
bool prefixHasMore = prefixParts.MoveNext(); bool prefixHasMore = prefixParts.MoveNext();