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

fixed amb1686 - ReplaceString or ReplaceStringEx with an empty search string would crash. it now throws an error instead.

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402220
This commit is contained in:
David Anderson 2008-05-29 05:39:29 +00:00
parent 049f63e6fd
commit 1a86604d99
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/smn_string.cpp
View File

@ -460,8 +460,12 @@ static cell_t ReplaceString(IPluginContext *pContext, const cell_t *params)
pContext->LocalToString(params[4], &replace); pContext->LocalToString(params[4], &replace);
maxlength = (size_t)params[2]; maxlength = (size_t)params[2];
if (search[0] == '\0')
{
return pContext->ThrowNativeError("Cannot replace searches of empty strings");
}
return UTIL_ReplaceAll(text, maxlength, search, replace); return UTIL_ReplaceAll(text, maxlength, search, replace);
} }
static cell_t ReplaceStringEx(IPluginContext *pContext, const cell_t *params) static cell_t ReplaceStringEx(IPluginContext *pContext, const cell_t *params)
@ -477,6 +481,11 @@ static cell_t ReplaceStringEx(IPluginContext *pContext, const cell_t *params)
size_t searchLen = (params[5] == -1) ? strlen(search) : (size_t)params[5]; size_t searchLen = (params[5] == -1) ? strlen(search) : (size_t)params[5];
size_t replaceLen = (params[6] == -1) ? strlen(replace) : (size_t)params[6]; size_t replaceLen = (params[6] == -1) ? strlen(replace) : (size_t)params[6];
if (searchLen == 0)
{
return pContext->ThrowNativeError("Cannot replace searches of empty strings");
}
char *ptr = UTIL_ReplaceEx(text, maxlength, search, searchLen, replace, replaceLen); char *ptr = UTIL_ReplaceEx(text, maxlength, search, searchLen, replace, replaceLen);
if (ptr == NULL) if (ptr == NULL)