diff --git a/cl_dll/message.cpp b/cl_dll/message.cpp
index ff8d97bf..a8665c9f 100644
--- a/cl_dll/message.cpp
+++ b/cl_dll/message.cpp
@@ -281,9 +281,12 @@ void CHudMessage::MessageDrawScan( client_textmessage_t *pMessage, float time )
 		while( *pText && *pText != '\n' )
 		{
 			unsigned char c = *pText;
-			line[m_parms.lineLength] = c;
-			m_parms.width += gHUD.m_scrinfo.charWidths[c];
-			m_parms.lineLength++;
+			if (m_parms.lineLength < sizeof(line)-1)
+			{
+				line[m_parms.lineLength] = c;
+				m_parms.width += gHUD.m_scrinfo.charWidths[c];
+				m_parms.lineLength++;
+			}
 			pText++;
 		}
 		pText++;		// Skip LF