Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Missing returns for inarray and countinarray (#3295)

Browse Source 
Added some return cases if empty arrays are given to these two commands.

Thanks to @sader1992
This commit is contained in:
Sader Fawall 2018-07-07 13:46:14 +02:00 committed by Lemongrass3110
parent 255baff290
commit 500cfdc41f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/map/script.cpp
View File

@ -6415,6 +6415,12 @@ BUILDIN_FUNC(inarray)
array_size = script_array_highest_key(st, sd, name, ref) - 1; array_size = script_array_highest_key(st, sd, name, ref) - 1;
if (array_size < 0)
{
script_pushint(st, -1);
return SCRIPT_CMD_SUCCESS;
}
if (array_size > SCRIPT_MAX_ARRAYSIZE) if (array_size > SCRIPT_MAX_ARRAYSIZE)
{ {
ShowError("buildin_inarray: The array is too large.\n"); ShowError("buildin_inarray: The array is too large.\n");
@ -6497,6 +6503,12 @@ BUILDIN_FUNC(countinarray)
array_size1 = script_array_highest_key(st, sd, name1, ref1) - 1; array_size1 = script_array_highest_key(st, sd, name1, ref1) - 1;
array_size2 = script_array_highest_key(st, sd, name2, ref2) - 1; array_size2 = script_array_highest_key(st, sd, name2, ref2) - 1;
if (array_size1 < 0 || array_size2 < 0)
{
script_pushint(st, 0);
return SCRIPT_CMD_SUCCESS;
}
if (array_size1 > SCRIPT_MAX_ARRAYSIZE || array_size2 > SCRIPT_MAX_ARRAYSIZE) if (array_size1 > SCRIPT_MAX_ARRAYSIZE || array_size2 > SCRIPT_MAX_ARRAYSIZE)
{ {
ShowError("buildin_countinarray: The array is too large.\n"); ShowError("buildin_countinarray: The array is too large.\n");