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

Merge pull request #1243 from wilkemeyer/fix/skillidx-can-become-out-of-bounds

Browse Source 
map-server: increased size of skilldb_id2idx[] array, to fix crash caused by array oob access.
This commit is contained in:
Lemongrass3110 2016-05-05 00:06:00 +02:00
commit 09974e8ded
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/skill.c
View File

@ -58,7 +58,7 @@
#endif #endif
DBMap* skilldb_name2id = NULL; DBMap* skilldb_name2id = NULL;
static uint16 skilldb_id2idx[UINT16_MAX];/// Skill ID to Index lookup: skill_index = skill_get_index(skill_id) - [FWI] 20160423 the whole index thing should be removed. static uint16 skilldb_id2idx[(UINT16_MAX+1)];/// Skill ID to Index lookup: skill_index = skill_get_index(skill_id) - [FWI] 20160423 the whole index thing should be removed.
struct s_skill_db **skill_db; /// Skill DB struct s_skill_db **skill_db; /// Skill DB
static uint16 skill_num; /// Skill count, also as last index static uint16 skill_num; /// Skill count, also as last index
#define skill_next_idx() ( skill_num++ ) /// Macro to get&increase last skill number/index #define skill_next_idx() ( skill_num++ ) /// Macro to get&increase last skill number/index
@ -21227,7 +21227,7 @@ static void skill_readdb(void)
}; };
db_clear(skilldb_name2id); db_clear(skilldb_name2id);
for(i = 0; i < UINT16_MAX; i++) for(i = 0; i < (UINT16_MAX+1); i++)
skilldb_id2idx[i] = 0; skilldb_id2idx[i] = 0;
skill_db_destroy(); skill_db_destroy();