diff options
Diffstat (limited to 'src/char/char.c')
| -rw-r--r-- | src/char/char.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/char/char.c b/src/char/char.c index df5e0812b..acb7779d7 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3713,10 +3713,8 @@ int check_connect_login_server(int tid, unsigned int tick, int id, int data) { realloc_fifo(login_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
WFIFOHEAD(login_fd, 86);
WFIFOW(login_fd,0) = 0x2710;
- memset(WFIFOP(login_fd,2), 0, 24);
- memcpy(WFIFOP(login_fd,2), userid, strlen(userid) < 24 ? strlen(userid) : 24);
- memset(WFIFOP(login_fd,26), 0, 24);
- memcpy(WFIFOP(login_fd,26), passwd, strlen(passwd) < 24 ? strlen(passwd) : 24);
+ memcpy(WFIFOP(login_fd,2), userid, 24);
+ memcpy(WFIFOP(login_fd,26), passwd, 24);
WFIFOL(login_fd,50) = 0;
WFIFOL(login_fd,54) = char_ip;
WFIFOL(login_fd,58) = char_port;
@@ -3876,9 +3874,9 @@ int char_config_read(const char *cfgName) { ShowInfo("Console Silent Setting: %d\n", atoi(w2));
msg_silent = atoi(w2);
} else if (strcmpi(w1, "userid") == 0) {
- memcpy(userid, w2, 24);
+ strncpy(userid, w2, 24);
} else if (strcmpi(w1, "passwd") == 0) {
- memcpy(passwd, w2, 24);
+ strncpy(passwd, w2, 24);
} else if (strcmpi(w1, "server_name") == 0) {
memcpy(server_name, w2, sizeof(server_name));
server_name[sizeof(server_name) - 1] = '\0';
|