summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-06-05 02:44:24 +0000
committerJeremy Allison <jra@samba.org>2003-06-05 02:44:24 +0000
commitbf50387f492ac273a7c3d22c0f9d298466059e89 (patch)
tree6cb4ed52d9ad06a0f8e9f7021d8bc2e55b57f28d /source3
parent3bdfd57a2dc590896a2e45652ad4f5e3c2358108 (diff)
downloadsamba-bf50387f492ac273a7c3d22c0f9d298466059e89.tar.gz
samba-bf50387f492ac273a7c3d22c0f9d298466059e89.tar.bz2
samba-bf50387f492ac273a7c3d22c0f9d298466059e89.zip
Never second guess tridge.... (always talloc an internal pointer... ).
Jeremy. (This used to be commit 72ecdb387db60a4afab4d4fabf76f4c1d7ecbeeb)
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_parse/parse_samr.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 2146ccec91..47bf3f390d 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -4614,16 +4614,14 @@ BOOL samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
return False;
if (r_u->ptr != 0 && r_u->num_sids != 0) {
- uint32 *ptr_sid;
+ uint32 *ptr_sid = NULL;
if(!prs_uint32("num_sids1", ps, depth, &r_u->num_sids1))
return False;
- if (UNMARSHALLING(ps)) {
- ptr_sid = talloc(ps->mem_ctx, sizeof(uint32) * r_u->num_sids1);
- if (!ptr_sid) {
- return False;
- }
+ ptr_sid = talloc(ps->mem_ctx, sizeof(uint32) * r_u->num_sids1);
+ if (!ptr_sid) {
+ return False;
}
for (i = 0; i < r_u->num_sids1; i++) {