The branch, master has been updated
via 7a1e69e eventlog: Fix CID 1363194 Resource leak
via d5ef8db eventlog: Fix CID 242105 Unchecked return value
from d48b623 talloc: version 2.1.13
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7a1e69ebb73a61bc76595df99fe023bdc91ff532
Author: Volker Lendecke <v...@samba.org>
Date: Thu Apr 5 10:12:41 2018 +0200
eventlog: Fix CID 1363194 Resource leak
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Thu Apr 5 19:11:57 CEST 2018 on sn-devel-144
commit d5ef8dbeef36eeb30fa94efae1d6df8647679812
Author: Volker Lendecke <v...@samba.org>
Date: Thu Apr 5 10:11:16 2018 +0200
eventlog: Fix CID 242105 Unchecked return value
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/eventlog/eventlog.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c
index f9ac090..9053fdd 100644
--- a/source3/lib/eventlog/eventlog.c
+++ b/source3/lib/eventlog/eventlog.c
@@ -958,7 +958,7 @@ NTSTATUS evlog_tdb_entry_to_evt_entry(TALLOC_CTX *mem_ctx,
NT_STATUS_HAVE_NO_MEMORY(e->Computername);
if (t->sid_length > 0) {
- const char *sid_str = NULL;
+ char *sid_str = NULL;
size_t len;
if (!convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX,
t->sid.data, t->sid.length,
@@ -966,8 +966,12 @@ NTSTATUS evlog_tdb_entry_to_evt_entry(TALLOC_CTX *mem_ctx,
return NT_STATUS_INVALID_SID;
}
if (len > 0) {
- string_to_sid(&e->UserSid, sid_str);
+ bool ok = string_to_sid(&e->UserSid, sid_str);
+ if (!ok) {
+ return NT_STATUS_INVALID_SID;
+ }
}
+ TALLOC_FREE(sid_str);
}
e->Strings = talloc_array(mem_ctx, const char *,
t->num_of_strings);
--
Samba Shared Repository
