From 542ad876951945fccf8687618e380e9e60ff25ee Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 11 Jun 2009 10:36:39 +0000
Subject: Adjusted the code order in clif_parse_gmkick() to avoid invalid
 pointer access crashes when kicking mobs/npcs (bugreport:3229).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13880 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/clif.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/map/clif.c b/src/map/clif.c
index 160724eec..f0062517f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -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:
-- 
cgit v1.2.3-70-g09d2