diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-03 03:18:30 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-03 03:18:30 +0000 |
| commit | 2338a3bab2b1f22a1e298abf280ecf2a1534f743 (patch) | |
| tree | fc9bf1849abf8bd54fd602cde46456d3eca71057 | |
| parent | ce5da5fcc9ed2ce984eaf2aa1a9e0cfaba460bdb (diff) | |
| download | hercules-2338a3bab2b1f22a1e298abf280ecf2a1534f743.tar.gz hercules-2338a3bab2b1f22a1e298abf280ecf2a1534f743.tar.bz2 hercules-2338a3bab2b1f22a1e298abf280ecf2a1534f743.tar.xz hercules-2338a3bab2b1f22a1e298abf280ecf2a1534f743.zip | |
* Fixed a crash in clif_parse_FriendsListAdd, when a player is added that is not online (bugreport:4947, since r14835).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14843 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 3e7b2cbc7..753c19332 100644 --- a/Changelog-Trunk.txt +++ b/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 diff --git a/src/map/clif.c b/src/map/clif.c index 3d6f9f5af..afa8f79fd 100644 --- a/src/map/clif.c +++ b/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); |