Jelajahi Sumber

* Fixed a crash in clif_parse_FriendsListAdd, when a player is added that is not online (bugreport:4947, since r14835).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14843 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 tahun lalu
induk
melakukan
0eb61f5a95
2 mengubah file dengan 7 tambahan dan 5 penghapusan
  1. 2 0
      Changelog-Trunk.txt
  2. 5 5
      src/map/clif.c

+ 2 - 0
Changelog-Trunk.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2011/05/02
+	* Fixed a crash in clif_parse_FriendsListAdd, when a player is added that is not online (bugreport:4947, since r14835). [Ai4rei]
 2011/05/31
 	* Fixed a typo in buyingstore_create. [Inkfish]
 2011/05/30

+ 5 - 5
src/map/clif.c

@@ -11989,17 +11989,17 @@ void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd)
 
 	f_sd = map_nick2sd((char*)RFIFOP(fd,2));
 
-	if( sd->bl.id == f_sd->bl.id )
-	{// adding oneself as friend
-		return;
-	}
-
 	// Friend doesn't exist (no player with this name)
 	if (f_sd == NULL) {
 		clif_displaymessage(fd, msg_txt(3));
 		return;
 	}
 
+	if( sd->bl.id == f_sd->bl.id )
+	{// adding oneself as friend
+		return;
+	}
+
 	// @noask [LuzZza]
 	if(f_sd->state.noask) {
 		clif_noask_sub(sd, f_sd, 5);