From b320ad27d7c644d9031ad31310eacfb014c75289 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 20 Apr 2006 19:30:24 +0000
Subject: - Fixed buffer overflow in clif_MainChatMessage. It now prints a
 Debug message with the offending line.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6195 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/clif.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/map/clif.c b/src/map/clif.c
index 3aba4a0a1..0a73e03f4 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4802,14 +4802,17 @@ void clif_GlobalMessage(struct block_list *bl,char *message)
  */
 void clif_MainChatMessage(char* message) {
 
-	char buf[100];
+	char buf[128];
 	int len;
 	
 	if(!message)
 		return;
 		
 	len = strlen(message)+1;
-	
+	if (len+8 > sizeof(buf)) {
+		ShowDebug("clif_MainChatMessage: Received message too long (len %d): %s\n", len, message);
+		len = sizeof(buf)-8;
+	}
 	WBUFW(buf,0)=0x8d;
 	WBUFW(buf,2)=len+8;
 	WBUFL(buf,4)=0;
-- 
cgit v1.2.3-70-g09d2