Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #374 from Arkshine/fix/util_replaceall

Browse Source 
Fix UTIL_ReplaceAll not properly tracking length.
This commit is contained in:
Vincent Herbet
2016-06-10 15:29:33 +02:00
committed by GitHub
parent 1662b47f7e 2099a88ddf
commit 294066ca61
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
amxmodx/util.cpp
View File

@@ -459,11 +459,14 @@ 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;