diff options
| author | Gerald Carter <jerry@samba.org> | 2007-05-04 19:44:30 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-05-04 19:44:30 +0000 |
| commit | 15d8147714b35f5f806ff89e40a0b985ae4afa69 (patch) | |
| tree | 9a6dba73b3ca8368ad6b8f95a96946de002eb68e | |
| parent | 51217c2f03cc23c312511b3a0670f634f284b069 (diff) | |
| download | samba-15d8147714b35f5f806ff89e40a0b985ae4afa69.tar.gz | |
r22674: grab jra's samr parsing fix
| -rw-r--r-- | source/rpc_parse/parse_samr.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c index 273b1b97261..0ea81ae745f 100644 --- a/source/rpc_parse/parse_samr.c +++ b/source/rpc_parse/parse_samr.c @@ -4768,9 +4768,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++) { @@ -4780,7 +4785,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++) { |