s4/dsdb/schema: clang: Fix Array access results in null pointer deref
authorNoel Power <noel.power@suse.com>
Thu, 4 Jul 2019 11:50:29 +0000 (11:50 +0000)
committerNoel Power <npower@samba.org>
Mon, 8 Jul 2019 09:30:10 +0000 (09:30 +0000)
Fixes:
source4/dsdb/schema/schema_query.c:223:15: warning: Array access (from variable 'attr_list') results in a null pointer dereference <--[clang]
        attr_list[i] = NULL;
        ~~~~~~~~~    ^
1 warning generated.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
source4/dsdb/schema/schema_query.c

index 8a582161721edf8f42e4dec3a78a29483121738f..848f6cbd5b18ed8d2a68e9d8b698366b420caa21 100644 (file)
@@ -220,7 +220,9 @@ WERROR dsdb_linked_attribute_lDAPDisplayName_list(const struct dsdb_schema *sche
                attr_list[i] = cur->lDAPDisplayName;
                i++;
        }
-       attr_list[i] = NULL;
+       if (attr_list != NULL && attr_list[i] != NULL) {
+               attr_list[i] = NULL;
+       }
        *attr_list_ret = attr_list;
        return WERR_OK;
 }