Merge pull request #108041 from bs-mwoerner/cs_get_extension

akien-mga · akien-mga · commit 5aefc2eca804 · 2025-06-28T13:03:24.000+02:00
C#: Fix return value of `StringExtensions.GetExtension()`
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
@@ -430,8 +430,8 @@ public static string GetExtension(this string instance)
         {
             int pos = instance.RFind(".");
 
-            if (pos < 0)
-                return instance;
+            if (pos < 0 || pos < Math.Max(instance.RFind("/"), instance.RFind("\\")))
+                return string.Empty;
 
             return instance.Substring(pos + 1);
         }

Original file line number	Diff line number	Diff line change
`@@ -430,8 +430,8 @@ public static string GetExtension(this string instance)`
`430`	`430`	`{`
`431`	`431`	`int pos = instance.RFind(".");`
`432`	`432`
`433`		`- if (pos < 0)`
`434`		`- return instance;`
	`433`	`+ if (pos < 0 \|\| pos < Math.Max(instance.RFind("/"), instance.RFind("\\")))`
	`434`	`+ return string.Empty;`
`435`	`435`
`436`	`436`	`return instance.Substring(pos + 1);`
`437`	`437`	`}`