winbind: Fix bug 9854 -- NULL pointer dereference
authorVolker Lendecke <vl@samba.org>
Tue, 7 May 2013 10:39:16 +0000 (12:39 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 7 May 2013 12:49:07 +0000 (14:49 +0200)
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

source3/winbindd/winbindd_cache.c

index 86f15c22981fcba3fbcd62b72dae20936be1334c..72529276c8e6450c46f473353d825089136cf876 100644 (file)
@@ -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;
        }