diff options
| author | Volker Lendecke <vl@samba.org> | 2010-04-03 14:26:22 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-04-19 14:27:18 +0200 |
| commit | 1152cba5d2bb241a87511b7289c4714ea3990e53 (patch) | |
| tree | 17ec932226bd81e407fae9129eeffb6971f4ccda | |
| parent | cafba3d7a772385da36f7571690ba2ce2262cef5 (diff) | |
| download | samba-1152cba5d2bb241a87511b7289c4714ea3990e53.tar.gz samba-1152cba5d2bb241a87511b7289c4714ea3990e53.tar.bz2 samba-1152cba5d2bb241a87511b7289c4714ea3990e53.zip | |
libwbclient: Make wbcListUsers not use talloc
| -rw-r--r-- | nsswitch/libwbclient/wbc_sid.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/nsswitch/libwbclient/wbc_sid.c b/nsswitch/libwbclient/wbc_sid.c index 52f0e249ef..a6de7d5f34 100644 --- a/nsswitch/libwbclient/wbc_sid.c +++ b/nsswitch/libwbclient/wbc_sid.c @@ -628,11 +628,15 @@ wbcErr wbcListUsers(const char *domain_name, &response); BAIL_ON_WBC_ERROR(wbc_status); + users = wbcAllocateStringArray(response.data.num_entries); + if (users == 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) { @@ -642,19 +646,20 @@ wbcErr wbcListUsers(const char *domain_name, next = NULL; } - tmp = talloc_realloc(NULL, users, - const char *, - num_users+1); - BAIL_ON_PTR_ERROR(tmp, wbc_status); - users = tmp; - - users[num_users] = talloc_strdup(users, current); + users[num_users] = strdup(current); BAIL_ON_PTR_ERROR(users[num_users], wbc_status); - - num_users++; + num_users += 1; + if (num_users > response.data.num_entries) { + wbc_status = WBC_ERR_INVALID_RESPONSE; + goto done; + } + } + if (num_users != response.data.num_entries) { + wbc_status = WBC_ERR_INVALID_RESPONSE; + goto done; } - *_num_users = num_users; + *_num_users = response.data.num_entries; *_users = users; users = NULL; wbc_status = WBC_ERR_SUCCESS; @@ -662,7 +667,7 @@ wbcErr wbcListUsers(const char *domain_name, done: winbindd_free_response(&response); if (users) { - talloc_free(users); + wbcFreeMemory(users); } return wbc_status; } |