Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-09-12 15:47:41 UTC
Modified files:
ChangeLog ircd/m_join.c
Log message:
Be more conservative when handling empty keys.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.691 ircu2.10/ChangeLog:1.692
--- ircu2.10/ChangeLog:1.691 Sun Sep 11 20:40:16 2005
+++ ircu2.10/ChangeLog Mon Sep 12 08:47:30 2005
@@ -1,3 +1,8 @@
+2005-09-12 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/m_join.c (m_join): If we find an empty key, null out the
+ key pointer.
+
2005-09-11 Michael Poole <[EMAIL PROTECTED]>
* RELEASE.NOTES: Mention the side benefits of this change.
Index: ircu2.10/ircd/m_join.c
diff -u ircu2.10/ircd/m_join.c:1.30 ircu2.10/ircd/m_join.c:1.31
--- ircu2.10/ircd/m_join.c:1.30 Thu Sep 1 20:27:27 2005
+++ ircu2.10/ircd/m_join.c Mon Sep 12 08:47:31 2005
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_join.c,v 1.30 2005/09/02 03:27:27 entrope Exp $
+ * $Id: m_join.c,v 1.31 2005/09/12 15:47:31 entrope Exp $
*/
#include "config.h"
@@ -131,6 +131,10 @@
&& (keys = strchr(key = keys, ',')))
*keys++ = '\0';
+ /* Empty keys are the same as no keys. */
+ if (!key[0])
+ key = 0;
+
clean_channelname(name);
if (!IsChannelName(name))
{
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
