sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r22673: Fix for Jerry's reversion. We still need to check size

Browse Source 
before talloc.
Jeremy.
(This used to be commit 9e4c6ab739)
This commit is contained in:
Jeremy Allison 2007-05-04 19:14:51 +00:00 committed by Gerald (Jerry) Carter
parent e468268335
commit 32b9beb164
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/rpc_parse/parse_samr.c
View File

@ -4838,9 +4838,14 @@ BOOL samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
if(!prs_uint32("num_sids1", ps, depth, &r_u->num_sids1))
return False;
ptr_sid = TALLOC_ARRAY(ps->mem_ctx, uint32, r_u->num_sids1);
if (!ptr_sid) {
return False;
/* We must always use talloc here even when marshalling. */
if (r_u->num_sids1) {
ptr_sid = TALLOC_ARRAY(ps->mem_ctx, uint32, r_u->num_sids1);
if (!ptr_sid) {
return False;
}
} else {
ptr_sid = NULL;
}
for (i = 0; i < r_u->num_sids1; i++) {
@ -4850,7 +4855,14 @@ BOOL samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
}
if (UNMARSHALLING(ps)) {
r_u->sid = TALLOC_ARRAY(ps->mem_ctx, DOM_SID2, r_u->num_sids1);
if (r_u->num_sids1) {
r_u->sid = TALLOC_ARRAY(ps->mem_ctx, DOM_SID2, r_u->num_sids1);
if (!r_u->sid) {
return False;
}
} else {
r_u->sid = NULL;
}
}
for (i = 0; i < r_u->num_sids1; i++) {