The branch, master has been updated
via 2e09407 s3:winbind: work around coverity false positive.
via 08e03fa ctdb: Fix posible NULL deref in logging_init()
from a9211ec build: Fix generation of CTDB manpages while creating
tarball
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2e09407c5b992db0da5ca3a6d1f38341dc42d070
Author: Jeremy Allison <j...@samba.org>
Date: Thu Feb 23 09:41:03 2017 -0800
s3:winbind: work around coverity false positive.
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Thu Feb 23 23:54:48 CET 2017 on sn-devel-144
commit 08e03fa7f5fdc7f988fbbb26929e8c5727f36c2e
Author: Andreas Schneider <a...@samba.org>
Date: Thu Feb 16 17:38:41 2017 +0100
ctdb: Fix posible NULL deref in logging_init()
Found by covscan.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12592
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/common/logging.c | 7 +++++++
source3/winbindd/winbindd_list_users.c | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/logging.c b/ctdb/common/logging.c
index 3d586bf..c8ccf26 100644
--- a/ctdb/common/logging.c
+++ b/ctdb/common/logging.c
@@ -521,7 +521,14 @@ int logging_init(TALLOC_CTX *mem_ctx, const char *logging,
}
name = strtok(str, ":");
+ if (name == NULL) {
+ return EINVAL;
+ }
option = strtok(NULL, ":");
+ /*
+ * option can be NULL here, both setup()
+ * backends handle this.
+ */
for (i=0; i<ARRAY_SIZE(log_backend); i++) {
if (strcmp(log_backend[i].name, name) == 0) {
diff --git a/source3/winbindd/winbindd_list_users.c
b/source3/winbindd/winbindd_list_users.c
index 9a751a7..fcbe8be 100644
--- a/source3/winbindd/winbindd_list_users.c
+++ b/source3/winbindd/winbindd_list_users.c
@@ -178,7 +178,7 @@ NTSTATUS winbindd_list_users_recv(struct tevent_req *req,
response->length += len;
response->data.num_entries = 0;
- if (len >= 1) {
+ if (result != NULL && len >= 1) {
len -= 1;
response->data.num_entries = 1;
--
Samba Shared Repository
