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

Adjusted the code order in clif_parse_gmkick() to avoid invalid pointer access crashes when kicking mobs/npcs (bugreport:3229).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13880 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2009-06-11 10:36:39 +00:00
parent 84ddfa85bb
commit 042688ca7a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/map/clif.c
View File

@ -10703,21 +10703,26 @@ void clif_parse_GMKick(int fd, struct map_session_data *sd)
clif_GM_kickack(sd, 0);
return;
}
clif_GM_kick(sd, tsd);
if(log_config.gm && lv >= log_config.gm) {
char message[256];
sprintf(message, "/kick %s (%d)", tsd->status.name, tsd->status.char_id);
log_atcommand(sd, message);
}
clif_GM_kick(sd, tsd);
}
break;
case BL_MOB:
status_percent_damage(&sd->bl, target, 100, 0, true);
{
if(log_config.gm && lv >= log_config.gm) {
char message[256];
sprintf(message, "/kick %s (%d)", status_get_name(target), status_get_class(target));
log_atcommand(sd, message);
}
status_percent_damage(&sd->bl, target, 100, 0, true); // can invalidate 'target'
}
break;
case BL_NPC:
{
@ -10725,15 +10730,17 @@ void clif_parse_GMKick(int fd, struct map_session_data *sd)
lv = get_atcommand_level(atcommand_unloadnpc);
if( pc_isGM(sd) < lv )
return;
// copy-pasted from atcommand_unloadnpc
npc_unload_duplicates(nd);
npc_unload(nd);
npc_read_event_script();
if( log_config.gm && lv >= log_config.gm ) {
char message[256];
sprintf(message, "/kick %s (%d)", status_get_name(target), status_get_class(target));
log_atcommand(sd, message);
}
// copy-pasted from atcommand_unloadnpc
npc_unload_duplicates(nd);
npc_unload(nd); // invalidates 'target'
npc_read_event_script();
}
break;
default: