[SCM] Samba Shared Repository - branch master updated

Anoop C S anoopcs at samba.org
Tue Aug 19 09:46:02 UTC 2025


The branch, master has been updated
       via  d4d231dc50f nsswitch/libwbclient: Fix CID #1034862 Resource leak
       via  5a1521838a8 nsswitch/libwbclient: Fix CID #1034853 Resource leak
       via  708549989e9 examples/libsmbclient: Fix CID #1273089 Resource leak
      from  ae9a56901e0 smbd: Fix CID 1664060: Incorrect expression (IDENTICAL_BRANCHES)

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


- Log -----------------------------------------------------------------
commit d4d231dc50f1bbf42ae8cd8fb49f96ae6c4c0ee8
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 18 17:14:00 2025 +0200

    nsswitch/libwbclient: Fix CID #1034862 Resource leak
    
    Guenther
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Anoop C S <anoopcs at samba.org>
    
    Autobuild-User(master): Anoop C S <anoopcs at samba.org>
    Autobuild-Date(master): Tue Aug 19 09:45:46 UTC 2025 on atb-devel-224

commit 5a1521838a8b7a5e8f26c71c0feae415aa48abc4
Author: Günther Deschner <gd at samba.org>
Date:   Sat Aug 16 16:45:15 2025 +0200

    nsswitch/libwbclient: Fix CID #1034853 Resource leak
    
    Guenther
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Anoop C S <anoopcs at samba.org>

commit 708549989e929214b16d4178be3de83762cc633c
Author: Günther Deschner <gd at samba.org>
Date:   Wed Aug 13 19:04:39 2025 +0200

    examples/libsmbclient: Fix CID #1273089 Resource leak
    
    Guenther
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Anoop C S <anoopcs at samba.org>

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

Summary of changes:
 examples/libsmbclient/testctx.c       |  4 +++-
 nsswitch/libwbclient/tests/wbclient.c | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/libsmbclient/testctx.c b/examples/libsmbclient/testctx.c
index e410731739a..b5e6a63dd9b 100644
--- a/examples/libsmbclient/testctx.c
+++ b/examples/libsmbclient/testctx.c
@@ -7,10 +7,12 @@ static void create_and_destroy_context (void)
 {
 	int i;
 	SMBCCTX *ctx;
+	char *option_name = strdup("debug_to_stderr");
 	ctx = smbc_new_context ();
 	/* Both should do the same thing */
 	smbc_setOptionDebugToStderr(ctx, 1);
-	smbc_option_set(ctx, strdup("debug_to_stderr"), 1);
+	smbc_option_set(ctx, option_name, 1);
+	free(option_name);
 	smbc_setDebug(ctx, 1);
 	i = smbc_getDebug(ctx);
 	if (i != 1) {
diff --git a/nsswitch/libwbclient/tests/wbclient.c b/nsswitch/libwbclient/tests/wbclient.c
index 01fa2892c35..a58e65023da 100644
--- a/nsswitch/libwbclient/tests/wbclient.c
+++ b/nsswitch/libwbclient/tests/wbclient.c
@@ -231,16 +231,18 @@ static bool test_wbc_sidtostring(struct torture_context *tctx)
 	struct wbcDomainSid sid;
 	const char *sid_string = "S-1-5-32";
 	char *sid_string2;
+	bool ret = true;
 
 	torture_assert_wbc_ok(tctx, wbcStringToSid(sid_string, &sid),
 			      "wbcStringToSid of %s failed", sid_string);
 	torture_assert_wbc_ok(tctx, wbcSidToString(&sid, &sid_string2),
 			      "wbcSidToString of %s failed", sid_string);
-	torture_assert_str_equal(tctx, sid_string, sid_string2,
+	torture_assert_str_equal_goto(tctx, sid_string, sid_string2, ret, done,
 		"sid strings differ");
+ done:
 	wbcFreeMemory(sid_string2);
 
-	return true;
+	return ret;
 }
 
 static bool test_wbc_guidtostring(struct torture_context *tctx)
@@ -248,16 +250,18 @@ static bool test_wbc_guidtostring(struct torture_context *tctx)
 	struct wbcGuid guid;
 	const char *guid_string = "f7cf07b4-1487-45c7-824d-8b18cc580811";
 	char *guid_string2;
+	bool ret = true;
 
 	torture_assert_wbc_ok(tctx, wbcStringToGuid(guid_string, &guid),
 			      "wbcStringToGuid of %s failed", guid_string);
 	torture_assert_wbc_ok(tctx, wbcGuidToString(&guid, &guid_string2),
 			      "wbcGuidToString of %s failed", guid_string);
-	torture_assert_str_equal(tctx, guid_string, guid_string2,
+	torture_assert_str_equal_goto(tctx, guid_string, guid_string2, ret, done,
 				 "guid strings differ");
+ done:
 	wbcFreeMemory(guid_string2);
 
-	return true;
+	return ret;
 }
 
 static bool test_wbc_domain_info(struct torture_context *tctx)


-- 
Samba Shared Repository



More information about the samba-cvs mailing list