Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add null check in StringExtension #1090

Merged
merged 1 commit into from
Jul 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Assets/UniGLTF/Runtime/Extensions/StringExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ public static string EscapeFilePath(this string path)
// https://docs.unity3d.com/Manual/BestPracticeUnderstandingPerformanceInUnity5.html
public static bool FastStartsWith(this string a, string b)
{
if (a == null || b == null)
{
return false;
}

var aLen = a.Length;
var bLen = b.Length;
if (aLen < bLen)
Expand All @@ -94,6 +99,11 @@ public static bool FastStartsWith(this string a, string b)

public static bool FastEndsWith(this string a, string b)
{
if (a == null || b == null)
{
return false;
}

var aLen = a.Length;
var bLen = b.Length;
if (aLen < bLen)
Expand Down
2 changes: 1 addition & 1 deletion Assets/UniGLTF/Runtime/UniGLTF/Format/glTFTexture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public string GetExt()
}
else
{
return Path.GetExtension(uri).ToLower();
return Path.GetExtension(uri)?.ToLowerInvariant() ?? string.Empty;
}
}
}
Expand Down