From cd38e9580e428103cef39e2e29f62472b2f336d3 Mon Sep 17 00:00:00 2001 From: "Federico G. Schwindt" Date: Sun, 11 Aug 2013 20:57:11 +0100 Subject: [PATCH] Fix 2 bugs introduced in 74514b8c23 Channel_Modes() and Channel_Topic() return static memory that is zeroed at creation time. Fix checking for empty modes and topic so they're propagated correctly. --- src/ngircd/irc-channel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 17ecbf93..0978a19d 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -688,7 +688,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) return CONNECTED; if (Req->argv[1][0] == '+') { - if (!Channel_Modes(chan)) { + if (!*Channel_Modes(chan)) { /* OK, this channel doesn't have modes yet, * set the received ones: */ Channel_SetModes(chan, &Req->argv[1][1]); @@ -727,7 +727,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) if (arg_topic > 0) { /* We got a topic */ - if (!Channel_Topic( chan ) && Req->argv[arg_topic][0]) { + if (!*Channel_Topic(chan) && Req->argv[arg_topic][0]) { /* OK, there is no topic jet */ Channel_SetTopic(chan, Client, Req->argv[arg_topic]); IRC_WriteStrChannelPrefix(Client, chan, from, false, -- 2.39.2