[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  14df5d20a8e s3: RPC: Don't crash on trying to talloc_free(-1) if smb_iconv_open_ex() fails.
       via  155883e85c9 s3: VFS: Remove now-unused variable in shadow_copy2_get_real_filename().
      from  afd3bd01eb4 docs-xml/smbdotconf: clarify the quoting for advanced "interfaces" options

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 14df5d20a8ec00bf8627732284f427f6463177e3
Author: Jeremy Allison <jra at samba.org>
Date:   Wed May 6 12:36:00 2020 -0700

    s3: RPC: Don't crash on trying to talloc_free(-1) if smb_iconv_open_ex() fails.
    
    Assign output from smb_iconv_open_ex() to a temporary
    handle. Only assign to mds_ctx->[handles] if correctly
    opened otherwise we end up trying to call smb_iconv_close(-1).
    
    MacOSX Catalina triggers this.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14372
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Thu May  7 18:03:16 UTC 2020 on sn-devel-184

commit 155883e85c9ef53bde3c294296ccec4ed5a9d0a5
Author: Jeremy Allison <jra at samba.org>
Date:   Wed May 6 11:30:51 2020 -0700

    s3: VFS: Remove now-unused variable in shadow_copy2_get_real_filename().
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_shadow_copy2.c |  1 -
 source3/rpc_server/mdssvc/mdssvc.c | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index f8f0f82e79e..5a9074e802b 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -2410,7 +2410,6 @@ static int shadow_copy2_get_real_filename(struct vfs_handle_struct *handle,
 					  TALLOC_CTX *mem_ctx,
 					  char **found_name)
 {
-	char *path = fname->base_name;
 	struct shadow_copy2_private *priv = NULL;
 	struct shadow_copy2_config *config = NULL;
 	time_t timestamp = 0;
diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c
index fce3335d602..d6edc1c1686 100644
--- a/source3/rpc_server/mdssvc/mdssvc.c
+++ b/source3/rpc_server/mdssvc/mdssvc.c
@@ -1528,6 +1528,7 @@ struct mds_ctx *mds_init_ctx(TALLOC_CTX *mem_ctx,
 	struct mds_ctx *mds_ctx;
 	int backend;
 	bool ok;
+	smb_iconv_t iconv_hnd = (smb_iconv_t)-1;
 
 	mds_ctx = talloc_zero(mem_ctx, struct mds_ctx);
 	if (mds_ctx == NULL) {
@@ -1566,21 +1567,23 @@ struct mds_ctx *mds_init_ctx(TALLOC_CTX *mem_ctx,
 		goto error;
 	}
 
-	mds_ctx->ic_nfc_to_nfd = smb_iconv_open_ex(mds_ctx,
+	iconv_hnd = smb_iconv_open_ex(mds_ctx,
 						   "UTF8-NFD",
 						   "UTF8-NFC",
 						   false);
-	if (mds_ctx->ic_nfc_to_nfd == (smb_iconv_t)-1) {
+	if (iconv_hnd == (smb_iconv_t)-1) {
 		goto error;
 	}
+	mds_ctx->ic_nfc_to_nfd = iconv_hnd;
 
-	mds_ctx->ic_nfd_to_nfc = smb_iconv_open_ex(mds_ctx,
+	iconv_hnd = smb_iconv_open_ex(mds_ctx,
 						   "UTF8-NFC",
 						   "UTF8-NFD",
 						   false);
-	if (mds_ctx->ic_nfd_to_nfc == (smb_iconv_t)-1) {
+	if (iconv_hnd == (smb_iconv_t)-1) {
 		goto error;
 	}
+	mds_ctx->ic_nfd_to_nfc = iconv_hnd;
 
 	mds_ctx->sharename = talloc_strdup(mds_ctx, sharename);
 	if (mds_ctx->sharename == NULL) {


-- 
Samba Shared Repository