1 files changed, 13 insertions, 3 deletions
diff --git a/src/tools/oping/oping_server.c b/src/tools/oping/oping_server.c
index 33af28c4..e98ca040 100644
--- a/src/tools/oping/oping_server.c
+++ b/src/tools/oping/oping_server.c
@@ -237,6 +237,14 @@ int server_main(void)
                 return -1;
         }
 
+        if (pthread_mutex_init(&server.lock, NULL)) {
+                fqueue_destroy(server.fq);
+                fset_destroy(server.flows);
+                return -1;
+        }
+
+        memset(server.times, 0, sizeof(server.times));
+
         pthread_create(&server.cleaner_pt, NULL, cleaner_thread, NULL);
 
         if (server.busy) {
@@ -255,11 +263,13 @@ int server_main(void)
 
         pthread_cancel(server.cleaner_pt);
 
-        fset_destroy(server.flows);
-        fqueue_destroy(server.fq);
-
+        /* Join cancellable threads before tearing down their fset. */
         pthread_join(server.server_pt, NULL);
         pthread_join(server.cleaner_pt, NULL);
 
+        pthread_mutex_destroy(&server.lock);
+        fset_destroy(server.flows);
+        fqueue_destroy(server.fq);
+
         return 0;
 }