fix indexOf

HaxeFoundation · Jan 26, 2025 · 25e22a5 · 25e22a5
1 parent b7fce0e
commit 25e22a5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/std/jvm/StringExt.hx b/std/jvm/StringExt.hx
@@ -48,13 +48,19 @@ class StringExt {
 	}
 
 	public static function indexOf(me:String, str:String, startIndex:Null<Int>) {
+		if(str == null) {
+			return -1;
+		}
 		if (str.length == 0) {
 			return java.lang.Math.max(0, java.lang.Math.min(startIndex == null ? 0 : startIndex, me.length));
 		}
 		return if (startIndex == null) (cast me : NativeString).indexOf(str) else (cast me : NativeString).indexOf(str, startIndex);
 	}
 
 	public static function lastIndexOf(me:String, str:String, ?startIndex:Int):Int {
+		if(str == null) {
+			return -1;
+		}
 		if (str.length == 0) {
 			return java.lang.Math.max(0, java.lang.Math.min(startIndex == null ? me.length : startIndex, me.length));
 		}