mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-07-06 11:52:50 +00:00
Code Issues Releases Wiki Activity

[Parser]: Don't use Client_Type after command has been processed.

Browse Source 
This caused a read from already free'd memory, if the processed
command (IRC_QUIT) calls Client_Destroy. (from HEAD)
This commit is contained in:
Florian Westphal 2008-02-05 13:11:20 +00:00
parent 64a98338d5
commit de4676f066
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ngircd/parse.c
View File

@ -12,7 +12,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: parse.c,v 1.69 2007/11/21 12:16:36 alex Exp $"; static char UNUSED id[] = "$Id: parse.c,v 1.69.2.1 2008/02/05 13:11:20 fw Exp $";
/** /**
* @file * @file
@ -358,7 +358,7 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
bool result; bool result;
COMMAND *cmd; COMMAND *cmd;
NUMERIC *num; NUMERIC *num;
int i; int i, client_type;
assert( Idx >= 0 ); assert( Idx >= 0 );
assert( Req != NULL ); assert( Req != NULL );
@ -436,6 +436,7 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
} }
cmd = My_Commands; cmd = My_Commands;
client_type = Client_Type(client);
while( cmd->name ) while( cmd->name )
{ {
/* Befehl suchen */ /* Befehl suchen */
@ -444,7 +445,7 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
cmd++; continue; cmd++; continue;
} }
if( Client_Type( client ) & cmd->type ) if( client_type & cmd->type )
{ {
/* Command is allowed for this client: call it and count produced bytes */ /* Command is allowed for this client: call it and count produced bytes */
Conn_ResetWCounter( ); Conn_ResetWCounter( );
@ -452,7 +453,7 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
cmd->bytes += Conn_WCounter( ); cmd->bytes += Conn_WCounter( );
/* Adjust counters */ /* Adjust counters */
if( Client_Type( client ) != CLIENT_SERVER ) cmd->lcount++; if( client_type != CLIENT_SERVER ) cmd->lcount++;
else cmd->rcount++; else cmd->rcount++;
return result; return result;