[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  0326549a052 s3/utils: check result of talloc_strdup
       via  972127daddc s3/utils: Check return of talloc_strdup
       via  19eb88bc53e s3/param: Check return of talloc_strdup
      from  6dcf8d76ccc vfs-docs: Fix the list of full_audit operations

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


- Log -----------------------------------------------------------------
commit 0326549a052c22e4929e3760fd5011c35e32fe33
Author: Noel Power <noel.power at suse.com>
Date:   Mon Oct 17 10:27:31 2022 +0100

    s3/utils: check result of talloc_strdup
    
    follow to commit 4b15d8c2a5c8547b84e7926fed9890b5676b8bc3
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15205
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Oct 17 19:49:37 UTC 2022 on sn-devel-184

commit 972127daddc7a32d23fb84d97102557035b06f5b
Author: Noel Power <noel.power at suse.com>
Date:   Mon Oct 17 10:25:00 2022 +0100

    s3/utils: Check return of talloc_strdup
    
    followup to e82699fcca3716d9ed0450263fd83f948de8ffbe
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15205
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 19eb88bc53e481327bbd437b0c145d5765c6dcec
Author: Noel Power <noel.power at suse.com>
Date:   Mon Oct 17 10:17:34 2022 +0100

    s3/param: Check return of talloc_strdup
    
    followup to commit ff003fc87b8164610dfd6572347c05308c4b2fd7
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15205
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/param/test_lp_load.c |  5 +++++
 source3/utils/pdbedit.c      | 12 ++++++++++--
 source3/utils/testparm.c     |  5 +++++
 3 files changed, 20 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c
index 03be4118efd..9f3d5516805 100644
--- a/source3/param/test_lp_load.c
+++ b/source3/param/test_lp_load.c
@@ -83,6 +83,11 @@ int main(int argc, const char **argv)
 
 	if (poptPeekArg(pc)) {
 		config_file = talloc_strdup(frame, poptGetArg(pc));
+		if (config_file == NULL) {
+			DBG_ERR("out of memory\n");
+			TALLOC_FREE(frame);
+			exit(1);
+		}
 	} else {
 		config_file = get_dyn_CONFIGFILE();
 	}
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index eb4f3072df8..ede467108bb 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -1149,8 +1149,16 @@ int main(int argc, const char **argv)
 
 	poptGetArg(pc); /* Drop argv[0], the program name */
 
-	if (user_name == NULL)
-		user_name = talloc_strdup(frame, poptGetArg(pc));
+	if (user_name == NULL) {
+		if (poptPeekArg(pc)) {
+			user_name = talloc_strdup(frame, poptGetArg(pc));
+			if (user_name == NULL) {
+				fprintf(stderr, "out of memory\n");
+				TALLOC_FREE(frame);
+				exit(1);
+			}
+		}
+	}
 
 	setparms =	(backend ? BIT_BACKEND : 0) +
 			(verbose ? BIT_VERBOSE : 0) +
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index c751c06dcc9..e0455b9d7b6 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -844,6 +844,11 @@ static void do_per_share_checks(int s)
 
 	if (poptPeekArg(pc)) {
 		config_file = talloc_strdup(frame, poptGetArg(pc));
+                if (config_file == NULL) {
+                        DBG_ERR("out of memory\n");
+                        TALLOC_FREE(frame);
+                        exit(1);
+                }
 	} else {
 		config_file = get_dyn_CONFIGFILE();
 	}


-- 
Samba Shared Repository