Commit Diff

Commit:
1fa2af5b3a95cad24c3e8b56ee7e57aa5084bfdb
From:
Alexander Barton <alex@barton.de>
Date:
Message:
Fix handling of channel mode sequence with/without arguments For example, don't generate wrong error messages when handling "MODE #chan +IIIIItn *!aa@b *!bb@c *!cc@d *!dd@e *!ee@f".
Actions:
Patch | Tree
commit - 05cc9bf9b064c7048f6b197462a686c5a9100798
commit + 1fa2af5b3a95cad24c3e8b56ee7e57aa5084bfdb
blob - d8329b1655e2a5f66b88277dd5a0274d86b09ab7
blob + 01f87621a6d670df9b7973528d3892b3672caee4
--- src/ngircd/irc-mode.c
+++ src/ngircd/irc-mode.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -280,7 +280,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Ori
 
 	/* Are there changed modes? */
 	if (the_modes[1]) {
-		/* Remoce needless action modifier characters */
+		/* Remove needless action modifier characters */
 		len = strlen(the_modes) - 1;
 		if (the_modes[len] == '+' || the_modes[len] == '-')
 			the_modes[len] = '\0';
@@ -428,6 +428,8 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Ori
 			mode_ptr++;
 		if (!*mode_ptr) {
 			/* Try next argument if there's any */
+			if (arg_arg < 0)
+				break;
 			if (arg_arg > mode_arg)
 				mode_arg = arg_arg;
 			else