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

* Replaced maximum script array size literals with a define (constant).

Browse Source 
- Fixed an off-by-one mistake in copyarray, allowing to copy 1 element more into the target array, than allowed (since r10813).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14608 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2010-12-19 15:21:46 +00:00
parent 08684261f6
commit e45ba2f126
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -1,5 +1,8 @@
Date Added Date Added
2010/12/19
* Replaced maximum script array size literals with a define (constant). [Ai4rei]
- Fixed an off-by-one mistake in copyarray, allowing to copy 1 element more into the target array, than allowed (since r10813).
2010/12/18 2010/12/18
* Renamed item array in 'struct guild_storage' from 'storage_' to 'items' to match 'struct storage_data' (related r12933). [Ai4rei] * Renamed item array in 'struct guild_storage' from 'storage_' to 'items' to match 'struct storage_data' (related r12933). [Ai4rei]
* Bunch of intif_parse_LoadGuildStorage fixes. [Ai4rei] * Bunch of intif_parse_LoadGuildStorage fixes. [Ai4rei]

25
src/map/script.c
View File

@ -159,6 +159,9 @@
if( script_hasdata(st,n) ) \ if( script_hasdata(st,n) ) \
(t)=script_getnum(st,n); (t)=script_getnum(st,n);
/// Maximum amount of elements in script arrays
#define SCRIPT_MAX_ARRAYSIZE 128
#define SCRIPT_BLOCK_SIZE 512 #define SCRIPT_BLOCK_SIZE 512
enum { LABEL_NEXTLINE=1,LABEL_START }; enum { LABEL_NEXTLINE=1,LABEL_START };
@ -4748,7 +4751,7 @@ static int32 getarraysize(struct script_state* st, int32 id, int32 idx, int isst
if( isstring ) if( isstring )
{ {
for( ; idx < 128; ++idx ) for( ; idx < SCRIPT_MAX_ARRAYSIZE; ++idx )
{ {
char* str = (char*)get_val2(st, reference_uid(id, idx), ref); char* str = (char*)get_val2(st, reference_uid(id, idx), ref);
if( str && *str ) if( str && *str )
@ -4758,7 +4761,7 @@ static int32 getarraysize(struct script_state* st, int32 id, int32 idx, int isst
} }
else else
{ {
for( ; idx < 128; ++idx ) for( ; idx < SCRIPT_MAX_ARRAYSIZE; ++idx )
{ {
int32 num = (int32)get_val2(st, reference_uid(id, idx), ref); int32 num = (int32)get_val2(st, reference_uid(id, idx), ref);
if( num ) if( num )
@ -4811,8 +4814,8 @@ BUILDIN_FUNC(setarray)
} }
end = start + script_lastdata(st) - 2; end = start + script_lastdata(st) - 2;
if( end > 127 ) if( end >= SCRIPT_MAX_ARRAYSIZE )
end = 127; end = SCRIPT_MAX_ARRAYSIZE-1;
if( is_string_variable(name) ) if( is_string_variable(name) )
{// string array {// string array
@ -4874,8 +4877,8 @@ BUILDIN_FUNC(cleararray)
v = (void*)script_getnum(st, 3); v = (void*)script_getnum(st, 3);
end = start + script_getnum(st, 4); end = start + script_getnum(st, 4);
if( end > 127 ) if( end >= SCRIPT_MAX_ARRAYSIZE )
end = 127; end = SCRIPT_MAX_ARRAYSIZE-1;
for( ; start <= end; ++start ) for( ; start <= end; ++start )
set_reg(st, sd, reference_uid(id, start), name, v, script_getref(st,2)); set_reg(st, sd, reference_uid(id, start), name, v, script_getref(st,2));
@ -4944,8 +4947,8 @@ BUILDIN_FUNC(copyarray)
} }
count = script_getnum(st, 4); count = script_getnum(st, 4);
if( count > 128 - idx1 ) if( count >= SCRIPT_MAX_ARRAYSIZE - idx1 )
count = 128 - idx1; count = (SCRIPT_MAX_ARRAYSIZE-1) - idx1;
if( count <= 0 || (id1 == id2 && idx1 == idx2) ) if( count <= 0 || (id1 == id2 && idx1 == idx2) )
return 0;// nothing to copy return 0;// nothing to copy
@ -4962,7 +4965,7 @@ BUILDIN_FUNC(copyarray)
{// normal copy {// normal copy
for( i = 0; i < count; ++i ) for( i = 0; i < count; ++i )
{ {
if( idx2 + i < 128 ) if( idx2 + i < SCRIPT_MAX_ARRAYSIZE )
{ {
v = get_val2(st, reference_uid(id2, idx2 + i), reference_getref(data2)); v = get_val2(st, reference_uid(id2, idx2 + i), reference_getref(data2));
set_reg(st, sd, reference_uid(id1, idx1 + i), name1, v, reference_getref(data1)); set_reg(st, sd, reference_uid(id1, idx1 + i), name1, v, reference_getref(data1));
@ -5118,7 +5121,7 @@ BUILDIN_FUNC(getelementofarray)
} }
i = script_getnum(st, 3); i = script_getnum(st, 3);
if( i < 0 || i >= 128 ) if( i < 0 || i >= SCRIPT_MAX_ARRAYSIZE )
{ {
ShowWarning("script:getelementofarray: index out of range (%d)\n", i); ShowWarning("script:getelementofarray: index out of range (%d)\n", i);
script_reportdata(data); script_reportdata(data);
@ -12363,7 +12366,7 @@ int buildin_query_sql_sub(struct script_state* st, Sql* handle)
const char* query; const char* query;
struct script_data* data; struct script_data* data;
const char* name; const char* name;
int max_rows = 128;// maximum number of rows int max_rows = SCRIPT_MAX_ARRAYSIZE;// maximum number of rows
int num_vars; int num_vars;
int num_cols; int num_cols;