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

Added check for element in Get/SetEntProp funcs >= 0 (bug 5141, r=fyren).

Browse Source
This commit is contained in:
Nicholas Hastings 2011-10-20 21:35:50 -04:00
parent ca94a61acf
commit 5732e34f50
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/smn_entities.cpp
View File

@ -968,7 +968,7 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
} }
#define CHECK_SET_PROP_DATA_OFFSET() \ #define CHECK_SET_PROP_DATA_OFFSET() \
if (element >= td->fieldSize) \ if (element < 0 || element >= td->fieldSize) \
{ \ { \
return pContext->ThrowNativeError("Element %d is out of bounds (Prop %s has %d elements).", \ return pContext->ThrowNativeError("Element %d is out of bounds (Prop %s has %d elements).", \
element, \ element, \
@ -1001,7 +1001,7 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
{ \ { \
case type: \ case type: \
{ \ { \
if (element > 0) \ if (element != 0) \
{ \ { \
return pContext->ThrowNativeError("SendProp %s is not an array. Element %d is invalid.", \ return pContext->ThrowNativeError("SendProp %s is not an array. Element %d is invalid.", \
prop, \ prop, \
@ -1036,7 +1036,7 @@ static cell_t SetEntDataString(IPluginContext *pContext, const cell_t *params)
} \ } \
\ \
int elementCount = pTable->GetNumProps(); \ int elementCount = pTable->GetNumProps(); \
if (element >= elementCount) \ if (element < 0 || element >= elementCount) \
{ \ { \
return pContext->ThrowNativeError("Element %d is out of bounds (Prop %s has %d elements).", \ return pContext->ThrowNativeError("Element %d is out of bounds (Prop %s has %d elements).", \
element, \ element, \
@ -1816,14 +1816,14 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
bIsStringIndex = (td->fieldType != FIELD_CHARACTER); bIsStringIndex = (td->fieldType != FIELD_CHARACTER);
if (bIsStringIndex && element >= td->fieldSize) if (bIsStringIndex && (element < 0 || element >= td->fieldSize))
{ {
return pContext->ThrowNativeError("Element %d is out of bounds (Prop %s has %d elements).", return pContext->ThrowNativeError("Element %d is out of bounds (Prop %s has %d elements).",
element, element,
prop, prop,
td->fieldSize); td->fieldSize);
} }
else if (element > 1) else if (element != 0)
{ {
return pContext->ThrowNativeError("Prop %s is not an array. Element %d is invalid.", return pContext->ThrowNativeError("Prop %s is not an array. Element %d is invalid.",
prop, prop,
@ -1864,7 +1864,7 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params)
info.prop->GetType(), info.prop->GetType(),
DPT_String); DPT_String);
} }
else if (element > 0) else if (element != 0)
{ {
return pContext->ThrowNativeError("SendProp %s is not an array. Element %d is invalid.", return pContext->ThrowNativeError("SendProp %s is not an array. Element %d is invalid.",
prop, prop,