From 84b88781a0c39f7379ed85f74dc03c4e868a171f Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sat, 17 Jan 2015 15:59:12 -0200 Subject: 10 Distinct fixes Addressing out of bounds read-write. Special Thanks to 4144, Haruna! Signed-off-by: shennetsind --- src/map/skill.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 53be5541c..749f06799 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11592,7 +11592,7 @@ int skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int64 tick } else if( sc && battle->check_target(&sg->unit->bl,bl,sg->target_flag) > 0 ) { int sec = skill->get_time2(sg->skill_id,sg->skill_lv); if( status->change_start(ss, bl,type,10000,sg->skill_lv,1,sg->group_id,0,sec,SCFLAG_FIXEDRATE) ) { - const struct TimerData* td = sc->data[type]?timer->get(sc->data[type]->timer):NULL; + const struct TimerData* td = sce?timer->get(sce->timer):NULL; if( td ) sec = DIFF_TICK32(td->tick, tick); map->moveblock(bl, src->bl.x, src->bl.y, tick); @@ -18923,6 +18923,7 @@ bool skill_parse_row_changematerialdb(char* split[], int columns, int current) { if( current >= MAX_SKILL_PRODUCE_DB ) { ShowError("skill_changematerial_db: Maximum amount of entries reached (%d), increase MAX_SKILL_PRODUCE_DB\n",MAX_SKILL_PRODUCE_DB); + return false; } skill->changematerial_db[current].itemid = skill_id; -- cgit v1.2.3-60-g2f50