[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Wed May 13 17:35:04 UTC 2020


The branch, master has been updated
       via  84c7eb4787d lib:param: Fix memory leak in lpcfg_load_internal()
      from  6e419dda718 ctdb: increase TasksMax limit, the systemd default is just 512

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


- Log -----------------------------------------------------------------
commit 84c7eb4787d4bd9b4326570030ac088609c1389f
Author: awalker <awalker at ixsystems.com>
Date:   Mon Apr 6 15:50:41 2020 -0400

    lib:param: Fix memory leak in lpcfg_load_internal()
    
    Signed-off-by: awalker <awalker at ixsystems.com>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed May 13 17:34:43 UTC 2020 on sn-devel-184

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

Summary of changes:
 lib/param/loadparm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 777999a3a76..d00ed9dca43 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -3229,9 +3229,12 @@ static bool lpcfg_load_internal(struct loadparm_context *lp_ctx,
 	char *n2;
 	bool bRetval;
 
-	filename = talloc_strdup(lp_ctx, filename);
+	if (lp_ctx->szConfigFile != NULL) {
+		talloc_free(discard_const_p(char, lp_ctx->szConfigFile));
+		lp_ctx->szConfigFile = NULL;
+	}
 
-	lp_ctx->szConfigFile = filename;
+	lp_ctx->szConfigFile = talloc_strdup(lp_ctx, filename);
 
 	if (lp_ctx->s3_fns) {
 		return lp_ctx->s3_fns->load(filename);


-- 
Samba Shared Repository



More information about the samba-cvs mailing list