Fix UTIL_ReplaceAll not properly tracking length.

This commit is contained in:
Arkshine 2016-06-06 12:09:42 +02:00
parent 1662b47f7e
commit 2099a88ddf

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;