From 7dccb2818977a57199102e1fa100567f2f67c3f7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 7 May 2013 12:39:16 +0200 Subject: [PATCH] winbind: Fix bug 9854 -- NULL pointer dereference Signed-off-by: Volker Lendecke Reviewed-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Tue May 7 14:49:07 CEST 2013 on sn-devel-104 (cherry picked from commit 8c1283a89f746a108e8014b6fbc9a58a371950cf) --- source3/winbindd/winbindd_cache.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index 033ea77..0a65953 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -946,7 +946,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain *domain, if (!centry) return; - if (domain_name[0] == '\0') { + if ((domain_name == NULL) || (domain_name[0] == '\0')) { struct winbindd_domain *mydomain = find_domain_from_sid_noinit(sid); if (mydomain != NULL) { @@ -974,7 +974,7 @@ static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS sta if (!centry) return; - if (domain_name[0] == '\0') { + if ((domain_name == NULL) || (domain_name[0] == '\0')) { struct winbindd_domain *mydomain = find_domain_from_sid_noinit(sid); if (mydomain != NULL) { @@ -1798,7 +1798,7 @@ NTSTATUS wcache_name_to_sid(struct winbindd_domain *domain, return NT_STATUS_NO_MEMORY; } - if (domain_name[0] == '\0') { + if ((domain_name == NULL) || (domain_name[0] == '\0')) { domain_name = domain->name; } -- 1.7.3.4