diff options
| author | Volker Lendecke <vl@samba.org> | 2010-04-03 14:31:57 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-04-19 14:27:18 +0200 |
| commit | 8f3ab439f329234a47d8c32435a2e9606e8037da (patch) | |
| tree | 95922748e36209dcfd2760ae00a3921ab4cf4575 | |
| parent | 1152cba5d2bb241a87511b7289c4714ea3990e53 (diff) | |
| download | samba-8f3ab439f329234a47d8c32435a2e9606e8037da.tar.gz samba-8f3ab439f329234a47d8c32435a2e9606e8037da.tar.xz samba-8f3ab439f329234a47d8c32435a2e9606e8037da.zip | |
libwbclient: Make wbcListGroups not use talloc
| -rw-r--r-- | nsswitch/libwbclient/wbc_sid.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/nsswitch/libwbclient/wbc_sid.c b/nsswitch/libwbclient/wbc_sid.c index a6de7d5f34..c5a1d34ae6 100644 --- a/nsswitch/libwbclient/wbc_sid.c +++ b/nsswitch/libwbclient/wbc_sid.c @@ -699,11 +699,15 @@ wbcErr wbcListGroups(const char *domain_name, &response); BAIL_ON_WBC_ERROR(wbc_status); + groups = wbcAllocateStringArray(response.data.num_entries); + if (groups == NULL) { + return WBC_ERR_NO_MEMORY; + } + /* Look through extra data */ next = (const char *)response.extra_data.data; while (next) { - const char **tmp; const char *current = next; char *k = strchr(next, ','); if (k) { @@ -713,28 +717,27 @@ wbcErr wbcListGroups(const char *domain_name, next = NULL; } - tmp = talloc_realloc(NULL, groups, - const char *, - num_groups+1); - BAIL_ON_PTR_ERROR(tmp, wbc_status); - groups = tmp; - - groups[num_groups] = talloc_strdup(groups, current); + groups[num_groups] = strdup(current); BAIL_ON_PTR_ERROR(groups[num_groups], wbc_status); - - num_groups++; + num_groups += 1; + if (num_groups > response.data.num_entries) { + wbc_status = WBC_ERR_INVALID_RESPONSE; + goto done; + } + } + if (num_groups != response.data.num_entries) { + wbc_status = WBC_ERR_INVALID_RESPONSE; + goto done; } - *_num_groups = num_groups; + *_num_groups = response.data.num_entries; *_groups = groups; groups = NULL; wbc_status = WBC_ERR_SUCCESS; done: winbindd_free_response(&response); - if (groups) { - talloc_free(groups); - } + wbcFreeMemory(groups); return wbc_status; } |