Merge branch 'maint'

To get the single fix that was just merged to maint.

* maint:
  server: Fix memory leak at exit.

diff --git a/server.c b/server.c
index cb32d4d962e129ccf3589fa2ba3db8eb72e18984..1020e4fed98ac03d0981d80d517e68abf6e3a76f 100644 (file)
--- a/server.c
+++ b/server.c
@@ -407,15 +407,16 @@ static int command_post_select(struct sched *s, void *context)
 
        ret = task_get_notification(sct->task);
        if (ret < 0)
-               return ret;
+               goto fail;
        for (n = 0; n < sct->num_listen_fds; n++) {
                ret = command_task_accept(n, s, sct);
-               if (ret < 0) {
-                       free(sct->listen_fds);
-                       return ret;
-               }
+               if (ret < 0)
+                       goto fail;
        }
        return 0;
+fail:
+       free(sct->listen_fds);
+       return ret;
 }
 
 static void init_server_command_task(struct server_command_task *sct,