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

Fixed friend adding exploit, bugreport:4629

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15118 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2011-12-14 21:59:56 +00:00
parent d6bfea6132
commit bc87e05c2d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/map/clif.c
View File

@ -12279,7 +12279,10 @@ void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd)
clif_friendslist_reqack(sd, f_sd, 2); clif_friendslist_reqack(sd, f_sd, 2);
return; return;
} }
f_sd->friend_req = sd->status.char_id;
sd->friend_req = f_sd->status.char_id;
f_fd = f_sd->fd; f_fd = f_sd->fd;
WFIFOHEAD(f_fd,packet_len(0x207)); WFIFOHEAD(f_fd,packet_len(0x207));
WFIFOW(f_fd,0) = 0x207; WFIFOW(f_fd,0) = 0x207;
@ -12311,7 +12314,7 @@ void clif_parse_FriendsListReply(int fd, struct map_session_data *sd)
if (f_sd == NULL) if (f_sd == NULL)
return; return;
if (reply == 0) if (reply == 0 || !( sd->friend_req == f_sd->status.char_id && f_sd->friend_req == sd->status.char_id ) )
clif_friendslist_reqack(f_sd, sd, 1); clif_friendslist_reqack(f_sd, sd, 1);
else { else {
int i; int i;

5
src/map/pc.h
View File

@ -451,6 +451,11 @@ struct map_session_data {
unsigned int npc_idle_tick; unsigned int npc_idle_tick;
#endif #endif
/**
* Guarantees your friend request is legit (for bugreport:6429)
**/
int friend_req;
// temporary debugging of bug #3504 // temporary debugging of bug #3504
const char* delunit_prevfile; const char* delunit_prevfile;
int delunit_prevline; int delunit_prevline;