UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #518 from alliedmodders/UTIL_ReplaceAll-fix

Browse Source 
Fix UTIL_ReplaceAll not properly tracking length (bug 6472)
This commit is contained in:
Fyren 2016-06-06 16:40:17 -06:00
commit 4d8e76202d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/logic/stringutil.cpp
View File

@ -83,11 +83,13 @@ unsigned int UTIL_ReplaceAll(char *subject, size_t maxlength, const char *search
size_t searchLen = strlen(search); size_t searchLen = strlen(search);
size_t replaceLen = strlen(replace); size_t replaceLen = strlen(replace);
char *ptr = subject; char *newptr, *ptr = subject;
unsigned int total = 0; unsigned int total = 0;
while ((ptr = UTIL_ReplaceEx(ptr, maxlength, search, searchLen, replace, replaceLen, caseSensitive)) != NULL) while ((newptr = UTIL_ReplaceEx(ptr, maxlength, search, searchLen, replace, replaceLen, caseSensitive)) != NULL)
{ {
total++; total++;
maxlength -= newptr - ptr;
ptr = newptr;
if (*ptr == '\0') if (*ptr == '\0')
{ {
break; break;