extcap: Do not free mutex and cond in thread_pool_wait()

The name does not suggest that variables are freed in any way. Free the
mutex and cond where they are initialized, ie. in extcap_run_all().

Change-Id: I4e2ffacd32a8ba74831682438baed52e714433bb
Reviewed-on: https://code.wireshark.org/review/33223
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

1 files changed, 3 insertions, 2 deletions

diff --git a/extcap.c b/extcap.c
index 7695980cd7..d5cc98293e 100644
--- a/extcap.c
+++ b/extcap.c
@@ -147,9 +147,7 @@ thread_pool_wait(thread_pool_t *pool)
     while (pool->count != 0) {
         g_cond_wait(&pool->cond, &pool->data_mutex);
     }
-    g_cond_clear(&pool->cond);
     g_mutex_unlock(&pool->data_mutex);
-    g_mutex_clear(&pool->data_mutex);
 }
 
 static GHashTable *
@@ -513,6 +511,9 @@ extcap_run_all(const char *argv[], extcap_run_cb_t output_cb, gsize data_size, g
 
     /* Wait for all (sub)tasks to complete. */
     thread_pool_wait(&pool);
+
+    g_mutex_clear(&pool.data_mutex);
+    g_cond_clear(&pool.cond);
     g_thread_pool_free(pool.pool, FALSE, TRUE);
 
     g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "extcap: completed discovery of %d tools in %.3fms",