3 files changed, 13 insertions, 3 deletions
diff --git a/src/login/login.c b/src/login/login.c
index 538df26ab..a1a4243fe 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -413,7 +413,7 @@ int check_ipmask(unsigned int ip, const unsigned char *str) {
 int check_ip(unsigned int ip) {
 	int i;
 	unsigned char *p = (unsigned char *)&ip;
-	char buf[16];
+	char buf[20];
 	char * access_ip;
 	enum { ACF_DEF, ACF_ALLOW, ACF_DENY } flag = ACF_DEF;
 
@@ -462,7 +462,7 @@ int check_ip(unsigned int ip) {
 int check_ladminip(unsigned int ip) {
 	int i;
 	unsigned char *p = (unsigned char *)&ip;
-	char buf[16];
+	char buf[20];
 	char * access_ip;
 
 	if (access_ladmin_allownum == 0)
@@ -1034,6 +1034,10 @@ void send_GM_accounts(void) {
 			WBUFL(buf,len) = gm_account_db[i].account_id;
 			WBUFB(buf,len+4) = (unsigned char)gm_account_db[i].level;
 			len += 5;
+			if (len >= 32000) {
+				ShowWarning("send_GM_accounts: Too many accounts! Only %d out of %d were sent.\n", i, GM_num);
+				break;
+			}
 		}
 	WBUFW(buf,2) = len;
 	charif_sendallwos(-1, buf, len);
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index bf4acb534..edc78d48f 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -262,7 +262,11 @@ void send_GM_accounts(int fd) {
 				WBUFL(buf,len) = gm_account_db[i].account_id;
 				WBUFB(buf,len+4) = (unsigned char)gm_account_db[i].level;
 				len += 5;
+				if (len >= 32000) {
+				ShowWarning("send_GM_accounts: Too many accounts! Only %d out of %d were sent.\n", i, GM_num);
+				break;
 			}
+		}
 		WBUFW(buf,2) = len;
 		if (fd == -1)
 			charif_sendallwos(-1, buf, len);
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index c6b83011b..d624afa73 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9596,6 +9596,8 @@ static int atcommand_mutearea_sub(struct block_list *bl,va_list ap)
 		pl_sd->status.manner -= time;
 		if (pl_sd->status.manner < 0)
 			sc_start(&pl_sd->bl,SC_NOCHAT,100,0,0);
+		else if (pl_sd->sc.count && pl_sd->sc.data[SC_NOCHAT].timer != -1)
+			status_change_end(&pl_sd->bl, SC_NOCHAT, -1);
 	}
 	return 0;
 }
@@ -9617,7 +9619,7 @@ int atcommand_mutearea(
 	}
 
 	time = atoi(message);
-	if (time <= 0)
+	if (!time)
 		time = 15; // 15 minutes default
 	map_foreachinarea(atcommand_mutearea_sub,sd->bl.m, 
 		sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE,