Merge pull request #1090 from Santarh/nullCheck

Add null check in StringExtension
vrm-c · Jul 2, 2021 · 51180c5 · 51180c5
2 parents 95dafc3 + 700f47b
commit 51180c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Assets/UniGLTF/Runtime/Extensions/StringExtensions.cs b/Assets/UniGLTF/Runtime/Extensions/StringExtensions.cs
@@ -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)
@@ -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)

diff --git a/Assets/UniGLTF/Runtime/UniGLTF/Format/glTFTexture.cs b/Assets/UniGLTF/Runtime/UniGLTF/Format/glTFTexture.cs
@@ -68,7 +68,7 @@ public string GetExt()
                     }
                     else
                     {
-                        return Path.GetExtension(uri).ToLower();
+                        return Path.GetExtension(uri)?.ToLowerInvariant() ?? string.Empty;
                     }
             }
         }
-Original file 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 @@