commit 1a8825d7a3484d76ca16ea2aa9769cadca7758a4
author K.Takata <kentkt@csc.jp> Wed Jan 19 13:32:57 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Jan 19 13:32:57 2022 +0000
tree 3fa19e87656a4a3ef97ad6fc4635719c841d24c9
parent b0b2b73dca40c26ff1f4befe5c3aad3fd4bccfad

patch 8.2.4144: cannot load libsodium dynamically

Problem:    Cannot load libsodium dynamically.
Solution:   Support dynamic loading on MS-Windows. (Ken Takata, closes #9554)

src/buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 08db0fc..18aa2a0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2269,8 +2269,9 @@
 #endif
 #ifdef FEAT_CRYPT
 # ifdef FEAT_SODIUM
-    if (buf->b_p_key != NULL && (crypt_get_method_nr(buf) == CRYPT_M_SOD))
-	sodium_munlock(buf->b_p_key, STRLEN(buf->b_p_key));
+    if ((buf->b_p_key != NULL) && (*buf->b_p_key != NUL) &&
+				(crypt_get_method_nr(buf) == CRYPT_M_SOD))
+	crypt_sodium_munlock(buf->b_p_key, STRLEN(buf->b_p_key));
 # endif
     clear_string_option(&buf->b_p_key);
 #endif