summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-05-07 12:39:16 +0200
committerMichael Adam <obnox@samba.org>2013-05-07 14:49:07 +0200
commit8c1283a89f746a108e8014b6fbc9a58a371950cf (patch)
tree398fb85518b8955af4eda645a1879e794d119b4c
parent8ca4b7597d91355c4885b8ab89b0996c98f5c805 (diff)
downloadsamba-8c1283a89f746a108e8014b6fbc9a58a371950cf.tar.gz
samba-8c1283a89f746a108e8014b6fbc9a58a371950cf.tar.bz2
samba-8c1283a89f746a108e8014b6fbc9a58a371950cf.zip
winbind: Fix bug 9854 -- NULL pointer dereference
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Tue May 7 14:49:07 CEST 2013 on sn-devel-104
-rw-r--r--source3/winbindd/winbindd_cache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 86f15c2298..72529276c8 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -944,7 +944,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) {
@@ -972,7 +972,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) {
@@ -1810,7 +1810,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;
}