Merge from Wilmer

1 files changed, 9 insertions, 1 deletions

diff --git a/bitlbee.c b/bitlbee.c
index 54170816..fd73b2ae 100644
--- a/bitlbee.c
+++ b/bitlbee.c
@@ -164,7 +164,15 @@ gboolean bitlbee_io_current_client_read( GIOChannel *source, GIOCondition condit
 		irc_free( irc );
 		return FALSE;
 	} 
-		
+	
+	/* Very naughty, go read the RFCs! >:) */
+	if( irc->readbuffer && ( strlen( irc->readbuffer ) > 1024 ) )
+	{
+		log_message( LOGLVL_ERROR, "Maximum line length exceeded." );
+		irc_free( irc );
+		return FALSE;
+	}
+	
 	return TRUE;
 }