Merge pull request #2947 from 4144/fixskilluse

Fix possible use after free in unit_skilluse_id2
HerculesWS · Mar 8, 2021 · fed80d5 · fed80d5
2 parents ec1a3b7 + 8d3af91
commit fed80d5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/map/unit.c b/src/map/unit.c
@@ -1734,6 +1734,8 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill
 	if (sd != NULL && sd->auto_cast_current.itemskill_instant_cast && sd->auto_cast_current.type == AUTOCAST_ITEM)
 		casttime = 0;
 
+	map->freeblock_lock();
+
 	// in official this is triggered even if no cast time.
 	clif->useskill(src, src->id, target_id, 0,0, skill_id, skill_lv, casttime);
 	if( casttime > 0 || temp )
@@ -1798,6 +1800,8 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill
 	if (sd != NULL && battle_config.prevent_logout_trigger & PLT_SKILL)
 		sd->canlog_tick = timer->gettick();
 
+	map->freeblock_unlock();
+
 	return 1;
 }