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

Regex: Update regex_subtr (Increase buffer and make it UTF-8 safe)

Browse Source
This commit is contained in:
Arkshine 2014-07-17 14:02:21 +02:00
parent 939a724b1a
commit 9c84c17d5e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/regex/module.cpp
View File

@ -34,7 +34,9 @@
#include "pcre.h" #include "pcre.h"
#include "amxxmodule.h" #include "amxxmodule.h"
#include <am-vector.h> #include <am-vector.h>
#include <am-utility.h>
#include "CRegEx.h" #include "CRegEx.h"
#include "utils.h"
ke::Vector<RegEx *> PEL; ke::Vector<RegEx *> PEL;
@ -243,15 +245,24 @@ static cell AMX_NATIVE_CALL regex_substr(AMX *amx, cell *params)
} }
RegEx *x = PEL[id]; RegEx *x = PEL[id];
//good idea? probably not. static char buffer[16384]; // Same as AMXX buffer.
static char buffer[4096];
const char *ret = x->GetSubstring(params[2], buffer, 4095); size_t length;
size_t maxLength = ke::Min<size_t>(params[4], sizeof(buffer) - 1);
const char *ret = x->GetSubstring(params[2], buffer, maxLength, &length);
if (ret == NULL) if (ret == NULL)
{
return 0; return 0;
}
MF_SetAmxString(amx, params[3], ret, params[4]); if (length >= maxLength && ret[length - 1] & 1 << 7)
{
maxLength -= UTIL_CheckValidChar((char *)ret + length - 1);
}
MF_SetAmxString(amx, params[3], ret, maxLength);
return 1; return 1;
} }