From 51bd80f7a2a66fc3d2578ccedd68a94de84892ab Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Mon, 12 Sep 2005 15:47:31 +0000 Subject: [PATCH] Be more conservative when handling empty keys. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1479 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 5 +++++ ircd/m_join.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 11c1d56..f25f86b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-12 Michael Poole + + * ircd/m_join.c (m_join): If we find an empty key, null out the + key pointer. + 2005-09-11 Michael Poole * RELEASE.NOTES: Mention the side benefits of this change. diff --git a/ircd/m_join.c b/ircd/m_join.c index 39194b0..ad41295 100644 --- a/ircd/m_join.c +++ b/ircd/m_join.c @@ -131,6 +131,10 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) && (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)) { -- 2.20.1