X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_cmds.c;h=36cb5dbd56b004db67f3ffe50aa8723943ecae24;hb=3869bc4ae01a780a71af98e2f49c5b2f9297c9ae;hp=6276252c0f50d46d6e26786e75a896968b027956;hpb=6cdea2644603f8f6644976b73797f92b5f2e10c0;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 6276252c..36cb5dbd 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -1900,12 +1900,13 @@ void VM_strreplace(void)
 	replace_len = (int)strlen(replace);
 	subject_len = (int)strlen(subject);
 
+	si = 0;
 	for (i = 0; i < subject_len; i++)
 	{
 		for (j = 0; j < search_len && i+j < subject_len; j++)
 			if (subject[i+j] != search[j])
 				break;
-		if (j == search_len)
+		if (j == search_len || i+j == subject_len)
 		{
 		// found it at offset 'i'
 			for (j = 0; j < replace_len && si < (int)sizeof(string) - 1; j++)
@@ -1949,12 +1950,13 @@ void VM_strireplace(void)
 	replace_len = (int)strlen(replace);
 	subject_len = (int)strlen(subject);
 
+	si = 0;
 	for (i = 0; i < subject_len; i++)
 	{
 		for (j = 0; j < search_len && i+j < subject_len; j++)
 			if (tolower(subject[i+j]) != tolower(search[j]))
 				break;
-		if (j == search_len)
+		if (j == search_len || i+j == subject_len)
 		{
 		// found it at offset 'i'
 			for (j = 0; j < replace_len && si < (int)sizeof(string) - 1; j++)