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

Fix missing backward compatibility check in TrieGetString() and TrieGetArray() (#406)

Browse Source
This commit is contained in:
Vincent Herbet 2017-02-05 11:52:04 +01:00 committed by GitHub
parent 7bb1849968
commit 38b8dc338d
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
amxmodx/trie_natives.cpp
View File

@ -200,15 +200,30 @@ static cell AMX_NATIVE_CALL TrieGetString(AMX *amx, cell *params)
int len; int len;
const char *key = get_amxstring(amx, params[2], 0, len); const char *key = get_amxstring(amx, params[2], 0, len);
cell *pSize = get_amxaddr(amx, params[5]);
cell *refSize {};
if (*params / sizeof(cell) >= 5)
{
refSize = get_amxaddr(amx, params[5]);
}
StringHashMap<Entry>::Result r = t->map.find(key); StringHashMap<Entry>::Result r = t->map.find(key);
if (!r.found() || !r->value.isString()) if (!r.found() || !r->value.isString())
{ {
if (refSize)
{
*refSize = 0;
}
return 0; return 0;
} }
*pSize = (cell)set_amxstring_utf8(amx, params[3], r->value.chars(), strlen(r->value.chars()), params[4]); auto size = (cell)set_amxstring_utf8(amx, params[3], r->value.chars(), strlen(r->value.chars()), params[4]);
if (refSize)
{
*refSize = size;
}
return 1; return 1;
} }
@ -233,7 +248,12 @@ static cell AMX_NATIVE_CALL TrieGetArray(AMX *amx, cell *params)
int len; int len;
const char *key = get_amxstring(amx, params[2], 0, len); const char *key = get_amxstring(amx, params[2], 0, len);
cell *pValue = get_amxaddr(amx, params[3]); cell *pValue = get_amxaddr(amx, params[3]);
cell *pSize = get_amxaddr(amx, params[5]);
cell *refSize {};
if (*params / sizeof(cell) >= 5)
{
refSize = get_amxaddr(amx, params[5]);
}
StringHashMap<Entry>::Result r = t->map.find(key); StringHashMap<Entry>::Result r = t->map.find(key);
if (!r.found() || !r->value.isArray()) if (!r.found() || !r->value.isArray())
@ -241,14 +261,13 @@ static cell AMX_NATIVE_CALL TrieGetArray(AMX *amx, cell *params)
return 0; return 0;
} }
if (!r->value.array()) if (!r->value.array() || !params[4])
{ {
*pSize = 0; if (refSize)
return 1; {
} *refSize = 0;
}
if (!params[4])
{
return 1; return 1;
} }
@ -256,11 +275,17 @@ static cell AMX_NATIVE_CALL TrieGetArray(AMX *amx, cell *params)
cell *base = r->value.array(); cell *base = r->value.array();
if (length > size_t(params[4])) if (length > size_t(params[4]))
*pSize = params[4]; {
else length = params[4];
*pSize = length; }
if (refSize)
{
*refSize = length;
}
memcpy(pValue, base, sizeof(cell) * length);
memcpy(pValue, base, sizeof(cell) * pSize[0]);
return 1; return 1;
} }