Index: src/vortex.c =================================================================== --- src/vortex.c (revision 3242) +++ src/vortex.c (working copy) @@ -859,7 +859,6 @@ /**** vortex.c: init global mutex *****/ vortex_mutex_create (&ctx->frame_id_mutex); vortex_mutex_create (&ctx->connection_id_mutex); - vortex_mutex_create (&ctx->search_path_mutex); vortex_mutex_create (&ctx->tls_init_mutex); vortex_mutex_create (&ctx->listener_mutex); vortex_mutex_create (&ctx->listener_unlock); @@ -1130,7 +1129,6 @@ /* destroy global mutex */ vortex_mutex_destroy (&ctx->frame_id_mutex); vortex_mutex_destroy (&ctx->connection_id_mutex); - vortex_mutex_destroy (&ctx->search_path_mutex); vortex_mutex_destroy (&ctx->tls_init_mutex); vortex_mutex_destroy (&ctx->listener_mutex); vortex_mutex_destroy (&ctx->listener_unlock); Index: src/vortex_support.c =================================================================== --- src/vortex_support.c (revision 3242) +++ src/vortex_support.c (working copy) @@ -119,6 +119,9 @@ ctx->support_search_path = axl_list_new (axl_list_always_return_1, (axlDestroyFunc) __search_path_node_destroy); } + if( ctx->search_path_mutex == NULL) { + vortex_mutex_create(&ctx->search_path_mutex); + } return; } @@ -139,6 +142,7 @@ /* clear search path */ axl_list_free (ctx->support_search_path); ctx->support_search_path = NULL; + vortex_mutex_destroy(&ctx->search_path_mutex); return; }