diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-03-31 13:04:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-04-09 11:52:35 +0300 |
| commit | b9640535e151f7bc74f94deb72d8e544b714984e (patch) | |
| tree | 985090f9a818aadac0e1ddaa63b192816ee53bc4 /src/char | |
| parent | c2029c1947091d59f543de911581c83e566e875c (diff) | |
| download | hercules-b9640535e151f7bc74f94deb72d8e544b714984e.tar.gz hercules-b9640535e151f7bc74f94deb72d8e544b714984e.tar.bz2 hercules-b9640535e151f7bc74f94deb72d8e544b714984e.tar.xz hercules-b9640535e151f7bc74f94deb72d8e544b714984e.zip | |
Add checks to loginif.c
Diffstat (limited to 'src/char')
| -rw-r--r-- | src/char/loginif.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/char/loginif.c b/src/char/loginif.c index 5247e6c3e..f53d9bb71 100644 --- a/src/char/loginif.c +++ b/src/char/loginif.c @@ -14,6 +14,7 @@ #include "../common/cbasetypes.h" #include "../common/core.h" +#include "../common/nullpo.h" #include "../common/showmsg.h" #include "../common/socket.h" #include "../common/timer.h" @@ -88,6 +89,7 @@ void do_final_loginif(void) void loginif_block_account(int account_id, int flag) { + Assert_retv(chr->login_fd != -1); WFIFOHEAD(chr->login_fd,10); WFIFOW(chr->login_fd,0) = 0x2724; WFIFOL(chr->login_fd,2) = account_id; @@ -97,6 +99,7 @@ void loginif_block_account(int account_id, int flag) void loginif_ban_account(int account_id, short year, short month, short day, short hour, short minute, short second) { + Assert_retv(chr->login_fd != -1); WFIFOHEAD(chr->login_fd,18); WFIFOW(chr->login_fd, 0) = 0x2725; WFIFOL(chr->login_fd, 2) = account_id; @@ -111,6 +114,7 @@ void loginif_ban_account(int account_id, short year, short month, short day, sho void loginif_unban_account(int account_id) { + Assert_retv(chr->login_fd != -1); WFIFOHEAD(chr->login_fd,6); WFIFOW(chr->login_fd,0) = 0x272a; WFIFOL(chr->login_fd,2) = account_id; @@ -119,6 +123,7 @@ void loginif_unban_account(int account_id) void loginif_changesex(int account_id) { + Assert_retv(chr->login_fd != -1); WFIFOHEAD(chr->login_fd,6); WFIFOW(chr->login_fd,0) = 0x2727; WFIFOL(chr->login_fd,2) = account_id; @@ -127,6 +132,8 @@ void loginif_changesex(int account_id) void loginif_auth(int fd, struct char_session_data* sd, uint32 ipl) { + Assert_retv(chr->login_fd != -1); + nullpo_retv(sd); WFIFOHEAD(chr->login_fd,23); WFIFOW(chr->login_fd,0) = 0x2712; // ask login-server to authenticate an account WFIFOL(chr->login_fd,2) = sd->account_id; @@ -140,6 +147,7 @@ void loginif_auth(int fd, struct char_session_data* sd, uint32 ipl) void loginif_send_users_count(int users) { + Assert_retv(chr->login_fd != -1); WFIFOHEAD(chr->login_fd,6); WFIFOW(chr->login_fd,0) = 0x2714; WFIFOL(chr->login_fd,2) = users; @@ -148,6 +156,7 @@ void loginif_send_users_count(int users) void loginif_connect_to_server(void) { + Assert_retv(chr->login_fd != -1); WFIFOHEAD(chr->login_fd,86); WFIFOW(chr->login_fd,0) = 0x2710; memcpy(WFIFOP(chr->login_fd,2), chr->userid, NAME_LENGTH); |