dict: Fix client connection reference counting

If the client disconnected while commands were still running, the destroy
callback could have been called multiple times.

Broken by 2ff2da52146609f4459bd0f7fd603e13400cb85e

Fixes:
Panic: file dict-connection.c: line 149 (dict_connection_unref): assertion failed: (array_count(&conn->cmds) == 0)

diff --git a/src/dict/dict-connection.c b/src/dict/dict-connection.c
index a9f38f245eb0475d7dddcc686730ded28d228a66..0ed046f6f427849cc3a9485e952fc1c9a266ba23 100644 (file)
--- a/src/dict/dict-connection.c
+++ b/src/dict/dict-connection.c
@@ -217,6 +217,14 @@ void dict_connection_unref_safe(struct dict_connection *conn)
 static void dict_connection_destroy(struct connection *_conn)
 {
        struct dict_connection *conn = container_of(_conn, struct dict_connection, conn);
+
+       /* If there are commands still running, we delay disconnecting can may
+          come back here. Track this so we unreference the connection only
+          once. */
+       if (conn->destroyed)
+               return;
+       conn->destroyed = TRUE;
+
        /* the connection is closed, but there may still be commands left
           running. finish them, even if the calling client can't be notified
           about whether they succeeded (clients may not even care).

diff --git a/src/dict/dict-connection.h b/src/dict/dict-connection.h
index 3eba772fe2b85f4a50ea17a7ff682dc522536124..a07b64b7addc1080f6c496f055a12475133c9ff9 100644 (file)
--- a/src/dict/dict-connection.h
+++ b/src/dict/dict-connection.h
@@ -28,6 +28,8 @@ struct dict_connection {
        ARRAY(struct dict_connection_transaction) transactions;
        ARRAY(struct dict_connection_cmd *) cmds;
        unsigned int async_id_counter;
+
+       bool destroyed;
 };
 
 struct master_service_connection;