sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Converted init_samr_q_lookup_names() and samr_io_q_lookup_names()

Browse Source 
to use tallocated memory instead of dodgy static arrays.
(This used to be commit 35d2794114)
This commit is contained in:
Tim Potter 2001-06-06 07:15:34 +00:00
parent 5264e9a2a7
commit b627b65d2b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/rpc_parse/parse_samr.c
View File

@ -4291,7 +4291,7 @@ BOOL samr_io_r_query_aliasmem(char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
inits a SAMR_Q_LOOKUP_NAMES structure. inits a SAMR_Q_LOOKUP_NAMES structure.
********************************************************************/ ********************************************************************/
void init_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES * q_u, void init_samr_q_lookup_names(TALLOC_CTX *ctx, SAMR_Q_LOOKUP_NAMES * q_u,
POLICY_HND *pol, uint32 flags, POLICY_HND *pol, uint32 flags,
uint32 num_names, char **name) uint32 num_names, char **name)
{ {
@ -4306,6 +4306,9 @@ void init_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES * q_u,
q_u->ptr = 0; q_u->ptr = 0;
q_u->num_names2 = num_names; q_u->num_names2 = num_names;
q_u->hdr_name = (UNIHDR *)talloc_zero(ctx, num_names * sizeof(UNIHDR));
q_u->uni_name = (UNISTR2 *)talloc_zero(ctx, num_names * sizeof(UNISTR2));
for (i = 0; i < num_names; i++) { for (i = 0; i < num_names; i++) {
int len_name = name[i] != NULL ? strlen(name[i]) : 0; int len_name = name[i] != NULL ? strlen(name[i]) : 0;
init_uni_hdr(&q_u->hdr_name[i], len_name); /* unicode header for user_name */ init_uni_hdr(&q_u->hdr_name[i], len_name); /* unicode header for user_name */
@ -4346,7 +4349,14 @@ BOOL samr_io_q_lookup_names(char *desc, SAMR_Q_LOOKUP_NAMES * q_u,
if(!prs_uint32("num_names2", ps, depth, &q_u->num_names2)) if(!prs_uint32("num_names2", ps, depth, &q_u->num_names2))
return False; return False;
SMB_ASSERT_ARRAY(q_u->hdr_name, q_u->num_names2); if (UNMARSHALLING(ps) && (q_u->num_names2 != 0)) {
q_u->hdr_name = (UNIHDR *)prs_alloc_mem(ps, sizeof(UNIHDR) *
q_u->num_names2);
q_u->uni_name = (UNISTR2 *)prs_alloc_mem(ps, sizeof(UNISTR2) *
q_u->num_names2);
if (!q_u->hdr_name || q_u->uni_name)
return False;
}
for (i = 0; i < q_u->num_names2; i++) { for (i = 0; i < q_u->num_names2; i++) {
if(!smb_io_unihdr("", &q_u->hdr_name[i], ps, depth)) if(!smb_io_unihdr("", &q_u->hdr_name[i], ps, depth))