Explicitly test for the empty string in Channel_UserHasMode()

[ngircd-alex.git] / src / ngircd / channel.c

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 03af496baf6631374aaa51fc7e6d664a86334709..9994e65f5708592aa48150fd20aa5ea2352082b0 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -174,7 +174,7 @@ Channel_InitPredefined( void )
                                        IRC_MODE(Client_ThisServer(), &Req);
                                }
 
-                               /* Original channel modes srings are no longer needed */
+                               /* Original channel modes strings are no longer needed */
                                free(conf_chan->modes[n]);
                        }
                }
@@ -778,10 +778,28 @@ Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
 } /* Channel_UserModes */
 
 
+/**
+ * Test if a user has a given channel user mode.
+ *
+ * @param Chan The channel to check.
+ * @param Client The client to check.
+ * @param Mode The channel user mode to test for.
+ * @return true if the user has the given channel user mode set.
+ */
 GLOBAL bool
 Channel_UserHasMode( CHANNEL *Chan, CLIENT *Client, char Mode )
 {
-       return strchr(Channel_UserModes(Chan, Client), Mode) != NULL;
+       char *channel_user_modes;
+
+       assert(Chan != NULL);
+       assert(Client != NULL);
+       assert(Mode > 0);
+
+       channel_user_modes = Channel_UserModes(Chan, Client);
+       if (!channel_user_modes || !*channel_user_modes)
+               return false;
+
+       return strchr(channel_user_modes, Mode) != NULL;
 } /* Channel_UserHasMode */