From 951ab9d41f399b436e1221d894d1e7c43ea8267e Mon Sep 17 00:00:00 2001 From: ultramage Date: Sun, 8 Mar 2009 00:10:39 +0000 Subject: Added several mail id checks to prevent a map server crash (bugreport:2837). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13571 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'src/map') diff --git a/src/map/clif.c b/src/map/clif.c index 02d47ad0b..b8127054e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11774,6 +11774,10 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id) void clif_parse_Mail_read(int fd, struct map_session_data *sd) { + int mail_id = RFIFOL(fd,2); + + if( mail_id <= 0 ) + return; if( mail_invalid_operation(sd) ) return; @@ -11785,9 +11789,12 @@ void clif_parse_Mail_read(int fd, struct map_session_data *sd) *------------------------------------------*/ void clif_parse_Mail_getattach(int fd, struct map_session_data *sd) { - int i, mail_id = RFIFOL(fd,2); + int mail_id = RFIFOL(fd,2); + int i; bool fail = false; + if( mail_id <= 0 ) + return; if( mail_invalid_operation(sd) ) return; @@ -11841,8 +11848,11 @@ void clif_parse_Mail_getattach(int fd, struct map_session_data *sd) *------------------------------------------*/ void clif_parse_Mail_delete(int fd, struct map_session_data *sd) { - int i, mail_id = RFIFOL(fd,2); + int mail_id = RFIFOL(fd,2); + int i; + if( mail_id <= 0 ) + return; if( mail_invalid_operation(sd) ) return; @@ -11866,8 +11876,11 @@ void clif_parse_Mail_delete(int fd, struct map_session_data *sd) *------------------------------------------*/ void clif_parse_Mail_return(int fd, struct map_session_data *sd) { - int i, mail_id = RFIFOL(fd,2); + int mail_id = RFIFOL(fd,2); + int i; + if( mail_id <= 0 ) + return; if( mail_invalid_operation(sd) ) return; -- cgit v1.2.3-70-g09d2