From bb3f487ee5c2a3e27dd6233d28fe53cb2d86a066 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Mon, 20 Jul 2020 22:29:18 +0200
Subject: [PATCH] lib/smbclient/Context: add global Mutex for
 smbc_{new,free}_context()

Preparing to replace `smbclient_mutex`, for finer-grained locking.
---
 src/lib/smbclient/Context.cxx | 10 +++++++++-
 src/lib/smbclient/Context.hxx | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/lib/smbclient/Context.cxx b/src/lib/smbclient/Context.cxx
index f61a80042..1a4239dc1 100644
--- a/src/lib/smbclient/Context.cxx
+++ b/src/lib/smbclient/Context.cxx
@@ -24,6 +24,8 @@
 
 #include <string.h>
 
+Mutex SmbclientContext::global_mutex;
+
 static void
 mpd_smbc_get_auth_data([[maybe_unused]] const char *srv,
 		       [[maybe_unused]] const char *shr,
@@ -40,7 +42,13 @@ mpd_smbc_get_auth_data([[maybe_unused]] const char *srv,
 SmbclientContext
 SmbclientContext::New()
 {
-	SMBCCTX *ctx = smbc_new_context();
+	SMBCCTX *ctx;
+
+	{
+		const std::lock_guard<Mutex> protect(global_mutex);
+		ctx = smbc_new_context();
+	}
+
 	if (ctx == nullptr)
 		throw MakeErrno("smbc_new_context() failed");
 
diff --git a/src/lib/smbclient/Context.hxx b/src/lib/smbclient/Context.hxx
index c892ddcc7..9c8d255e8 100644
--- a/src/lib/smbclient/Context.hxx
+++ b/src/lib/smbclient/Context.hxx
@@ -20,6 +20,8 @@
 #ifndef MPD_SMBCLIENT_CONTEXT_HXX
 #define MPD_SMBCLIENT_CONTEXT_HXX
 
+#include "thread/Mutex.hxx"
+
 #include <libsmbclient.h>
 
 #include <utility>
@@ -28,6 +30,14 @@
  * Wrapper for `SMBCCTX*`.
  */
 class SmbclientContext {
+	/**
+	 * This mutex protects the libsmbclient functions
+	 * smbc_new_context() and smbc_free_context() which need to be
+	 * serialized.  We need to do this because we can't use
+	 * smbc_thread_posix(), which is not exported by libsmbclient.
+	 */
+	static Mutex global_mutex;
+
 	SMBCCTX *ctx = nullptr;
 
 	explicit SmbclientContext(SMBCCTX *_ctx) noexcept
@@ -37,8 +47,10 @@ public:
 	SmbclientContext() = default;
 
 	~SmbclientContext() noexcept {
-		if (ctx != nullptr)
+		if (ctx != nullptr) {
+			const std::lock_guard<Mutex> protect(global_mutex);
 			smbc_free_context(ctx, 1);
+		}
 	}
 
 	SmbclientContext(SmbclientContext &&src) noexcept