ngIRCd CVSHEAD
+ - Fixed a possible buffer underrun when reading the MOTD file. Thanks
+ to Florian Westphal, <westphal@foo.fh-furtwangen.de>.
- Code cleanups from Florian Westphal, <westphal@foo.fh-furtwangen.de>.
- Fixed detection of IRC lines which are too long to send. Detected by
Florian Westphal, <westphal@foo.fh-furtwangen.de>.
--
-$Id: ChangeLog,v 1.253 2005/01/20 00:11:49 alex Exp $
+$Id: ChangeLog,v 1.254 2005/01/24 14:17:21 alex Exp $
#include "portab.h"
-static char UNUSED id[] = "$Id: irc-info.c,v 1.22 2004/05/07 11:19:21 alex Exp $";
+static char UNUSED id[] = "$Id: irc-info.c,v 1.23 2005/01/24 14:17:21 alex Exp $";
#include "imp.h"
#include <assert.h>
BOOLEAN ok;
CHAR line[127];
FILE *fd;
+ UINT line_len;
assert( Client != NULL );
if( ! IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return DISCONNECTED;
while( TRUE )
{
- if( ! fgets( line, 126, fd )) break;
- if( line[strlen( line ) - 1] == '\n' ) line[strlen( line ) - 1] = '\0';
+ if( ! fgets( line, sizeof( line ), fd )) break;
+
+ line_len = strlen( line );
+ if( line_len > 0 ) pos--;
+ if( line[line_len] == '\n' ) line[line_len] = '\0';
+
if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line ))
{
fclose( fd );