[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1048-g64f6bd6

[Jeremy Allison]

The branch, v3-4-test has been updated
       via  64f6bd6c9b24e985fcd56765190046d3e9a5344e (commit)
      from  b4f6bb84d1bcd5a09d7c20c2a7dac0bfb11f199f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 64f6bd6c9b24e985fcd56765190046d3e9a5344e
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 21 18:00:54 2009 -0700

    Ensure all possible uses of indirection through res are checked after
    an ldb_search.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/groupdb/mapping_ldb.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index fffc684..1980485 100644
--- a/source3/groupdb/mapping_ldb.c
+++ b/source3/groupdb/mapping_ldb.c
@@ -225,7 +225,7 @@ static bool get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
 	}
 
 	ret = ldb_search(ldb, dn, &res, dn, LDB_SCOPE_BASE, NULL, NULL);
-	if (ret != LDB_SUCCESS || res->count != 1) {
+	if (ret != LDB_SUCCESS || res == NULL || res->count != 1) {
 		goto failed;
 	}
 
@@ -251,7 +251,7 @@ static bool get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
 	ret = ldb_search(ldb, talloc_tos(), &res, NULL, LDB_SCOPE_SUBTREE,
 			 NULL, "(&(gidNumber=%u)(objectClass=groupMap))",
 			 (unsigned)gid);
-	if (ret != LDB_SUCCESS || res->count != 1) {
+	if (ret != LDB_SUCCESS || res == NULL || res->count != 1) {
 		goto failed;
 	}
 
@@ -276,7 +276,7 @@ static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
 
 	ret = ldb_search(ldb, talloc_tos(), &res, NULL, LDB_SCOPE_SUBTREE,
 			 NULL, "(&(ntName=%s)(objectClass=groupMap))", name);
-	if (ret != LDB_SUCCESS || (res && res->count != 1)) {
+	if (ret != LDB_SUCCESS || res == NULL || res->count != 1) {
 		goto failed;
 	}
 
@@ -341,7 +341,7 @@ static bool enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType sid_name_
 				 sid_name_use);
 	}
 
-	if (ret != LDB_SUCCESS) goto failed;
+	if (ret != LDB_SUCCESS || res == NULL) goto failed;
 
 	(*pp_rmap) = NULL;
 	*p_num_entries = 0;
@@ -390,7 +390,7 @@ static NTSTATUS one_alias_membership(const DOM_SID *member,
 	ret = ldb_search(ldb, talloc_tos(), &res, NULL, LDB_SCOPE_SUBTREE,
 			 attrs, "(&(member=%s)(objectClass=groupMap))",
 			 string_sid);
-	if (ret != LDB_SUCCESS) {
+	if (ret != LDB_SUCCESS || res == NULL) {
 		status = NT_STATUS_INTERNAL_DB_CORRUPTION;
 		goto failed;
 	}
@@ -510,7 +510,7 @@ static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num)
 
 	ret = ldb_search(ldb, ldb, &res, dn, LDB_SCOPE_BASE, attrs, NULL);
 	talloc_steal(dn, res);
-	if (ret == LDB_SUCCESS && res->count == 0) {
+	if (ret == LDB_SUCCESS && res && res->count == 0) {
 		talloc_free(dn);
 		return NT_STATUS_OK;
 	}


-- 
Samba Shared Repository