The branch, v3-6-test has been updated via 3dc411c s3: Fix Coverity ID 2201, NULL_RETURNS via 1db07d0 s3: Fix Coverity ID 2202, NULL_RETURNS (cherry picked from commit e88b9df78bc00985974e68e46f7218d0828ed6f0) via d535cdf s3: Fix Coverity ID 2203, NULL_RETURNS (cherry picked from commit e6d76ba832d87e59a50a5c044ecba5a6dc611958) from 710a2b6 s3: Fix a (invalid) uninitialized variable warning
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 3dc411c1ebedbbd82c51eca367b2d17455ec4728 Author: Volker Lendecke <v...@samba.org> Date: Wed Mar 23 13:11:26 2011 +0100 s3: Fix Coverity ID 2201, NULL_RETURNS Autobuild-User: Volker Lendecke <vlen...@samba.org> Autobuild-Date: Wed Mar 23 13:06:20 CET 2011 on sn-devel-104 (cherry picked from commit cfa8b3663266521c8583168b8f71535c43297481) commit 1db07d0f17a59604f7b28f2e70b668ab0d4443ef Author: Volker Lendecke <v...@samba.org> Date: Wed Mar 23 13:11:26 2011 +0100 s3: Fix Coverity ID 2202, NULL_RETURNS (cherry picked from commit e88b9df78bc00985974e68e46f7218d0828ed6f0) commit d535cdfe7a763adbdad5f2d860cae2f947f2b586 Author: Volker Lendecke <v...@samba.org> Date: Wed Mar 23 13:11:26 2011 +0100 s3: Fix Coverity ID 2203, NULL_RETURNS (cherry picked from commit e6d76ba832d87e59a50a5c044ecba5a6dc611958) ----------------------------------------------------------------------- Summary of changes: source3/rpc_server/spoolss/srv_spoolss_util.c | 3 +++ source3/utils/smbcacls.c | 3 +++ source3/winbindd/wb_gettoken.c | 4 ++++ 3 files changed, 10 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c index c4e5341..c49d610 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_util.c +++ b/source3/rpc_server/spoolss/srv_spoolss_util.c @@ -789,6 +789,9 @@ static WERROR winreg_printer_write_date(TALLOC_CTX *mem_ctx, } else { t = nt_time_to_unix(data); tm = localtime(&t); + if (tm == NULL) { + return map_werror_from_unix(errno); + } str = talloc_asprintf(mem_ctx, "%02d/%02d/%04d", tm->tm_mon + 1, tm->tm_mday, tm->tm_year + 1900); } diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index c7b586a..2f5ae85 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -1035,6 +1035,9 @@ static int inherit(struct cli_state *cli, const char *filename, } string_replace(parentname, '/', '\\'); parent = get_secdesc(cli,parentname); + if (parent == NULL) { + return EXIT_FAILED; + } for (i=0;i<parent->dacl->num_aces;i++) { struct security_ace *ace=&parent->dacl->aces[i]; /* Add inherited flag to all aces */ diff --git a/source3/winbindd/wb_gettoken.c b/source3/winbindd/wb_gettoken.c index 100a7b5..2f4cec8 100644 --- a/source3/winbindd/wb_gettoken.c +++ b/source3/winbindd/wb_gettoken.c @@ -139,6 +139,10 @@ static void wb_gettoken_gotlocalgroups(struct tevent_req *subreq) return; } domain = find_domain_from_sid_noinit(get_global_sam_sid()); + if (domain == NULL) { + tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR); + return; + } if (!wb_add_rids_to_sids(state, &state->num_sids, &state->sids, &domain->sid, num_rids, rids)) { tevent_req_nterror(req, NT_STATUS_NO_MEMORY); -- Samba Shared Repository