r15050: fixed a double free in the new messaging code.

(This used to be commit ee7869bb3c901fb91efedc8208aa56df927987c5)

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index f8f998f5cf1ed503f29e9664c1d605c33102f80c..c02a79ab8dde095e0950d390dcbc201845fbb56e 100644 (file)
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -364,12 +364,12 @@ void messaging_deregister(struct messaging_context *msg, uint32_t msg_type, void
        }       
 
        /* the list base possibly changed */
-       if (list == NULL) {
-               if (msg_type >= msg->num_types) {
+       if (msg_type >= msg->num_types) {
+               if (list == NULL) {
                        idr_remove(msg->dispatch_tree, msg_type);
-               } else {
-                       msg->dispatch[msg_type] = NULL;
                }
+       } else {
+               msg->dispatch[msg_type] = list;
        }
 }