From: Jeremy Allison <jra@samba.org>
Date: Sat, 18 Aug 2001 19:57:48 +0000 (+0000)
Subject: More Realloc fixes.
X-Git-Tag: samba-4.0.0alpha6~801^2~17586
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca66a07781a13bb0b953535fca26ffcf97df39ac;p=thirdparty%2Fsamba.git

More Realloc fixes.
Jeremy.
(This used to be commit b4fa49fe13cb93d578b1714d5863a9f50395bf65)
---

diff --git a/source3/nsswitch/wb_client.c b/source3/nsswitch/wb_client.c
index 104e91c4d4a..9ae7c8d3f9c 100644
--- a/source3/nsswitch/wb_client.c
+++ b/source3/nsswitch/wb_client.c
@@ -314,7 +314,7 @@ int winbind_initgroups(char *user, gid_t gid)
 		/* Add group to list if necessary */
 
 		if (!is_member) {
-			tgr = Realloc(groups, sizeof(gid_t) * ngroups + 1);
+			tgr = (gid_t *)Realloc(groups, sizeof(gid_t) * ngroups + 1);
 			
 			if (!tgr) {
 				errno = ENOMEM;
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index ff357dc0984..9fc2ee79a03 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -513,12 +513,21 @@ static BOOL get_sam_group_entries(struct getent_state *ent)
 		/* Copy entries into return buffer */
 
 		if (num_entries) {
+			struct acct_info *tnl;
 
-			name_list = Realloc(name_list,
+			tnl = (struct acct_info *)Realloc(name_list,
 					    sizeof(struct acct_info) *
 					    (ent->num_sam_entries +
 					     num_entries));
 
+			if (!tnl) {
+				DEBUG(0,("get_sam_group_entries: Realloc fail.\n"));
+				if (name_list)
+					free(name_list);
+				return False;
+			} else
+				name_list = tnl;
+
 			memcpy(&name_list[ent->num_sam_entries],
 			       sam_grp_entries, 
 			       num_entries * sizeof(struct acct_info));
@@ -761,8 +770,8 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
 
 enum winbindd_result winbindd_list_groups(struct winbindd_cli_state *state)
 {
-        uint32 total_entries = 0;
-        struct winbindd_domain *domain;
+	uint32 total_entries = 0;
+	struct winbindd_domain *domain;
 	struct getent_state groups;
 	char *ted, *extra_data = NULL;
 	int extra_data_len = 0, i;