Commit Diff

Commit:
e07542a1ff0f33b35dbab854596f29011e1ccf63
From:
Alexander Barton <alex@barton.de>
Date:
Message:
- Non-members of a channel could crash the server when trying to change its modes. Fixed.
Actions:
Patch | Tree
commit - 155f26eee2d8a31699165b78deb81619e5ad70a9
commit + e07542a1ff0f33b35dbab854596f29011e1ccf63
blob - 40dfb7329994d9b6428648f6bf65e82b22f2cff3
blob + ec8771e979007aad2ae7b5647c1057bb3865a000
--- src/ngircd/irc-mode.c
+++ src/ngircd/irc-mode.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-mode.c,v 1.29 2003/01/08 23:00:12 alex Exp $";
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.30 2003/01/17 19:04:19 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -279,6 +279,10 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Or
 	/* Is the user allowed to change modes? */
 	if( Client_Type( Client ) == CLIENT_USER )
 	{
+		/* Is the originating user on that channel? */
+		if( ! Channel_IsMemberOf( Channel, Origin )) return IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+
+		/* Is he channel operator? */
 		if( strchr( Channel_UserModes( Channel, Origin ), 'o' )) modeok = TRUE;
 		else modeok = FALSE;
 		if( Conf_OperCanMode )