sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-12 12:23:50 +03:00
Code Activity

Check return code of string_to_sid. (Merge from HEAD)

Browse Source
This commit is contained in:
Martin Pool
-
parent c31455779d
commit 5d09aea6f7
3 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/rpc_parse/parse_net.c
View File

@@ -873,10 +873,12 @@ static int init_dom_sid2s(TALLOC_CTX *ctx, const char *sids_str, DOM_SID2 **ppsi
int number;
DOM_SID2 *sids;
/* Count the number of SIDs. */
for (count = 0, ptr = sids_str;
next_token(&ptr, s2, NULL, sizeof(s2)); count++)
;
/* Count the number of valid SIDs. */
for (count = 0, ptr = sids_str; next_token(&ptr, s2, NULL, sizeof(s2)); ) {
DOM_SID tmpsid;
if (string_to_sid(&tmpsid, s2))
count++;
}
/* Now allocate space for them. */
*ppsids = (DOM_SID2 *)talloc_zero(ctx, count * sizeof(DOM_SID2));
@@ -885,11 +887,13 @@ static int init_dom_sid2s(TALLOC_CTX *ctx, const char *sids_str, DOM_SID2 **ppsi
sids = *ppsids;
for (number = 0, ptr = sids_str;
next_token(&ptr, s2, NULL, sizeof(s2)); number++) {
for (number = 0, ptr = sids_str; next_token(&ptr, s2, NULL, sizeof(s2)); ) {
DOM_SID tmpsid;
string_to_sid(&tmpsid, s2);
init_dom_sid2(&sids[number], &tmpsid);
if (string_to_sid(&tmpsid, s2)) {
/* count only valid sids */
init_dom_sid2(&sids[number], &tmpsid);
number++;
}
}
}
@@ -1804,9 +1808,9 @@ static BOOL net_io_sam_domain_info(const char *desc, SAM_DOMAIN_INFO * info,
if (!smb_io_unihdr("hdr_unknown", &info->hdr_unknown, ps, depth))
return False;
if (prs_offset(ps) + 40 > prs_data_size(ps))
if (ps->data_offset + 40 > ps->buffer_size)
return False;
prs_set_offset(ps, prs_offset(ps) + 40);
ps->data_offset += 40;
if (!smb_io_unistr2("uni_dom_name", &info->uni_dom_name,
info->hdr_dom_name.buffer, ps, depth))
@@ -1843,9 +1847,9 @@ static BOOL net_io_sam_group_info(const char *desc, SAM_GROUP_INFO * info,
if (!smb_io_bufhdr2("hdr_sec_desc", &info->hdr_sec_desc, ps, depth))
return False;
if (prs_offset(ps) + 48 > prs_data_size(ps))
if (ps->data_offset + 48 > ps->buffer_size)
return False;
prs_set_offset(ps, prs_offset(ps) + 48);
ps->data_offset += 48;
if (!smb_io_unistr2("uni_grp_name", &info->uni_grp_name,
info->hdr_grp_name.buffer, ps, depth))
@@ -2124,13 +2128,13 @@ static BOOL net_io_sam_account_info(const char *desc, uint8 sess_key[16],
uint32 len = 0x44;
if (!prs_uint32("pwd_len", ps, depth, &len))
return False;
old_offset = prs_offset(ps);
old_offset = ps->data_offset;
if (len == 0x44)
{
if (ps->io)
{
/* reading */
if (!prs_hash1(ps, prs_offset(ps), sess_key))
if (!prs_hash1(ps, ps->data_offset, sess_key))
return False;
}
if (!net_io_sam_passwd_info("pass", &info->pass,
@@ -2144,9 +2148,9 @@ static BOOL net_io_sam_account_info(const char *desc, uint8 sess_key[16],
return False;
}
}
if (old_offset + len > prs_data_size(ps))
if (old_offset + len > ps->buffer_size)
return False;
prs_set_offset(ps, old_offset + len);
ps->data_offset = old_offset + len;
}
if (!smb_io_buffer4("buf_sec_desc", &info->buf_sec_desc,
info->hdr_sec_desc.buffer, ps, depth))
@@ -2181,9 +2185,9 @@ static BOOL net_io_sam_group_mem_info(const char *desc, SAM_GROUP_MEM_INFO * inf
if (!prs_uint32("num_members", ps, depth, &info->num_members))
return False;
if (prs_offset(ps) + 16 > prs_data_size(ps))
if (ps->data_offset + 16 > ps->buffer_size)
return False;
prs_set_offset(ps, prs_offset(ps) + 16);
ps->data_offset += 16;
if (info->ptr_rids != 0)
{
@@ -2263,9 +2267,9 @@ static BOOL net_io_sam_alias_info(const char *desc, SAM_ALIAS_INFO * info,
if (!smb_io_unihdr("hdr_als_desc", &info->hdr_als_desc, ps, depth))
return False;
if (prs_offset(ps) + 40 > prs_data_size(ps))
if (ps->data_offset + 40 > ps->buffer_size)
return False;
prs_set_offset(ps, prs_offset(ps) + 40);
ps->data_offset += 40;
if (!smb_io_unistr2("uni_als_name", &info->uni_als_name,
info->hdr_als_name.buffer, ps, depth))
@@ -2300,9 +2304,9 @@ static BOOL net_io_sam_alias_mem_info(const char *desc, SAM_ALIAS_MEM_INFO * inf
if (info->ptr_members != 0)
{
if (prs_offset(ps) + 16 > prs_data_size(ps))
if (ps->data_offset + 16 > ps->buffer_size)
return False;
prs_set_offset(ps, prs_offset(ps) + 16);
ps->data_offset += 16;
if (!prs_uint32("num_sids", ps, depth, &info->num_sids))
return False;