fixed event_neonserv_kick and user-free-after-kick problem

diff --git a/src/UserNode.c b/src/UserNode.c
index fe68f3e796eb99ca823b70fdfb1fec86a9f723bf..887b9c9b36de9890db5519a9246d4f7684926b68 100644 (file)
--- a/src/UserNode.c
+++ b/src/UserNode.c
@@ -358,9 +358,12 @@ void delUser(struct UserNode* user, int freeUser) {
             removeChanUserFromLists(chanUser, 1, 0, freeUser);
         }
     }
-    if(freeUser)
-        free(user);
-    else
+    if(freeUser) {
+        if(user->flags & USERFLAG_IS_ON_WHO_QUEUE)
+            user->flags |= USERFLAG_FREE_AFTER_WHO;
+        else
+            free(user);
+    } else
         user->next = NULL;
 }
 

diff --git a/src/UserNode.h b/src/UserNode.h
index c1c4d800add329ad5987fefc5e1adef9ace59c5c..699c53990041aa255a6b94b4b350e1d25eb10e51 100644 (file)
--- a/src/UserNode.h
+++ b/src/UserNode.h
@@ -28,6 +28,8 @@
 #define USERFLAG_REPLY_PRIVMSG      0x0080
 #define USERFLAG_GOD_MODE           0x0100
 #define USERFLAG_HAS_USERID         0x0200
+#define USERFLAG_IS_ON_WHO_QUEUE    0x0400 /* prevents the user struct from beeing freed too early */
+#define USERFLAG_FREE_AFTER_WHO     0x0800 /* user struct is no more referenced - free it after WHO */
 
 #define USERFLAG_WAS_REGISTRING     0x20000000 /* only set for event_join if the quit reason was Registered */
 #define USERFLAG_SCRIPTFLAG1        0x40000000

diff --git a/src/WHOHandler.c b/src/WHOHandler.c
index e470abbda19a278d12385e341d6124005f7622c9..b0b8ddc51771f22fa5c349f255f31fd01147c2dc 100644 (file)
--- a/src/WHOHandler.c
+++ b/src/WHOHandler.c
@@ -177,6 +177,7 @@ void get_userauth(struct UserNode *user, userauth_callback_t callback, void *dat
     entry = addWHOQueueEntry(bot);
     entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERAUTH;
     entry->user = user;
+    user->flags |= USERFLAG_IS_ON_WHO_QUEUE;
     entry->callback[0] = callback;
     int i;
     for(i = 1; i < MAXCALLBACKS; i++)
@@ -308,6 +309,10 @@ void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int
                 callback(client, entry->user->nick, NULL, entry->data[i]);
             }
         }
+        entry->user->flags &= ~USERFLAG_IS_ON_WHO_QUEUE;
+        if(entry->user->flags & USERFLAG_FREE_AFTER_WHO) {
+            delUser(entry->user, 1);
+        }
     }
     free(entry);
 }

diff --git a/src/event_neonserv_kick.c b/src/event_neonserv_kick.c
index c9037d97c23352bed6b265e5311412dd5ac84edd..8e32d02a4dab680b87302f0a5f2d4310ede83131 100644 (file)
--- a/src/event_neonserv_kick.c
+++ b/src/event_neonserv_kick.c
@@ -18,13 +18,14 @@
 struct neonserv_event_kick_cache {
     struct ClientSocket *client;
     struct UserNode *user;
-    struct ChanUser *target;
+    struct UserNode *target;
+    struct ChanNode *chan;
     int userauth_pending;
 };
 
 static USERAUTH_CALLBACK(neonserv_event_kick_nick_lookup);
 static void neonserv_event_kick_async1(struct neonserv_event_kick_cache *cache);
-static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct ChanUser *target);
+static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct UserNode *target, struct ChanNode *chan);
 
 static void neonserv_event_kick(struct UserNode *user, struct ChanUser *target, char *reason) {
     struct ChanNode *chan = target->chan;
@@ -62,8 +63,9 @@ static void neonserv_event_kick(struct UserNode *user, struct ChanUser *target,
     }
     cache->client = client;
     cache->user = user;
-    cache->target = target;
-    cache->userauth_pending++;
+    cache->target = target->user;
+    cache->chan = target->chan;
+    cache->userauth_pending = 0;
     if(!(user->flags & USERFLAG_ISAUTHED)) {
         get_userauth(user, neonserv_event_kick_nick_lookup, cache);
         cache->userauth_pending++;
@@ -83,15 +85,15 @@ static USERAUTH_CALLBACK(neonserv_event_kick_nick_lookup) {
 
 static void neonserv_event_kick_async1(struct neonserv_event_kick_cache *cache) {
     if(cache->userauth_pending == 0) {
-        neonserv_event_kick_async2(cache->client, cache->user, cache->target);
+        neonserv_event_kick_async2(cache->client, cache->user, cache->target, cache->chan);
         free(cache);
     }
 }
 
-static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct ChanUser *target) {
-    if(isUserProtected(target->chan, target->user, user)) {
+static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct UserNode *target, struct ChanNode *chan) {
+    if(isUserProtected(chan, target, user)) {
         char buf[MAXLEN];
-        putsock(client, "KICK %s %s :%s", target->chan->name, user->nick, build_language_string(user, buf, "NS_USER_PROTECTED", target->user->nick));
-        putsock(client, "INVITE %s %s", target->user->nick, target->chan->name);
+        putsock(client, "KICK %s %s :%s", chan->name, user->nick, build_language_string(user, buf, "NS_USER_PROTECTED", target->nick));
+        putsock(client, "INVITE %s %s", target->nick, chan->name);
     }
 }