fixing giveownership logs access to invalid memory address after free

[irc/evilnet/x3.git] / src / chanserv.c

diff --git a/src/chanserv.c b/src/chanserv.c
index 3b0986cdea7cadd36d1e66ff9d72ca375f13044a..5fe14557be3b33a1d664132f355e1ebb7b747669 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -6705,8 +6705,8 @@ static CHANSERV_FUNC(cmd_giveownership)
 
     giveownership = calloc(1, sizeof(*giveownership));
     giveownership->issued = now;
-    giveownership->old_owner = curr_user->handle->handle;
-    giveownership->target = new_owner_hi->handle;
+    giveownership->old_owner = strdup(curr_user->handle->handle);
+    giveownership->target = strdup(new_owner_hi->handle);
     giveownership->target_access = new_owner_old_access;
     if(override)
     {
@@ -7343,6 +7343,18 @@ check_bans(struct userNode *user, const char *channel)
     return 0;
 }
 
+int
+channel_user_is_exempt(struct userNode *user, struct chanNode *channel)
+{
+   unsigned int ii;
+   for(ii = 0; ii < channel->exemptlist.used; ii++)
+   {
+       if(user_matches_glob(user, channel->exemptlist.list[ii]->exempt, MATCH_USENICK))
+           return true;
+   }
+   return false;
+}
+
 
 /* Welcome to my worst nightmare. Warning: Read (or modify)
    the code below at your own risk. */
@@ -7359,7 +7371,7 @@ handle_join(struct modeNode *mNode)
     unsigned int modes = 0, info = 0;
     char *greeting;
 
-    if(IsLocal(user) || !channel->channel_info || IsSuspended(channel->channel_info))
+    if(IsLocal(user) || !channel || !channel->channel_info || IsSuspended(channel->channel_info))
         return 0;
 
     cData = channel->channel_info;
@@ -7407,7 +7419,7 @@ handle_join(struct modeNode *mNode)
 
     /* TODO: maybe only people above inviteme level? -Rubin */
     /* We don't kick people with access */
-    if(!uData)
+    if(!uData && !channel_user_is_exempt(user, channel))
     {
         if(channel->banlist.used < MAXBANS)
         {