[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  c853a80 ctdb-common: Fix CID 1435600
       via  215d844 ctdb-common: Fix CID 1435599
      from  472dca2 debug: Add group logging classes

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


- Log -----------------------------------------------------------------
commit c853a8071a6efafe92e7df608ec636f43aa9d371
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 15 13:28:19 2018 +0200

    ctdb-common: Fix CID 1435600
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Wed May 16 09:51:07 CEST 2018 on sn-devel-144

commit 215d8448f0e51c4f5ffdcee6003dcbce4d1440a5
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue May 15 19:23:04 2018 +1000

    ctdb-common: Fix CID 1435599
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 ctdb/common/cmdline.c | 2 +-
 ctdb/common/logging.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c
index 2540ce5..ee360d4 100644
--- a/ctdb/common/cmdline.c
+++ b/ctdb/common/cmdline.c
@@ -337,7 +337,7 @@ static int cmdline_match(struct cmdline_context *cmdline)
 		size_t len;
 		char *t, *str;
 		int n = 0;
-		bool match;
+		bool match = false;
 
 		cmd = &cmdline->commands[i];
 		len = strlcpy(name, cmd->name, sizeof(name));
diff --git a/ctdb/common/logging.c b/ctdb/common/logging.c
index 3cc1933..dc8c4f7 100644
--- a/ctdb/common/logging.c
+++ b/ctdb/common/logging.c
@@ -173,13 +173,12 @@ static bool file_log_validate(const char *option)
 	dir = dirname(t);
 
 	ret = stat(dir, &st);
+	free(t);
 	if (ret != 0) {
-		free(t);
 		return false;
 	}
 
 	if (! S_ISDIR(st.st_mode)) {
-		free(t);
 		return false;
 	}
 


-- 
Samba Shared Repository