diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-09-30 01:49:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:14 -0500 |
| commit | f1c52270785285fcf68e2b22fbc83cbee38910fd (patch) | |
| tree | 9f150673e7729df6a3bae98b79df4cf66deb2714 /source4/librpc/ndr/ndr_basic.c | |
| parent | 9bc38ce65f1907230618b3edccafb1d33f753fe0 (diff) | |
| download | samba-f1c52270785285fcf68e2b22fbc83cbee38910fd.tar.gz samba-f1c52270785285fcf68e2b22fbc83cbee38910fd.tar.bz2 samba-f1c52270785285fcf68e2b22fbc83cbee38910fd.zip | |
r10637: use the correct memory context in the ndr_pull_* function
to build the talloc hierachie correct
metze
(This used to be commit afd9dda5773d381550bdb061a8e345b33e1fc371)
Diffstat (limited to 'source4/librpc/ndr/ndr_basic.c')
| -rw-r--r-- | source4/librpc/ndr/ndr_basic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index b3740c5e01..23e686f76f 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -559,7 +559,7 @@ NTSTATUS ndr_pull_ipv4address(struct ndr_pull *ndr, int ndr_flags, const char ** struct ipv4_addr in; NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &in.addr)); in.addr = htonl(in.addr); - *address = talloc_strdup(ndr, sys_inet_ntoa(in)); + *address = talloc_strdup(ndr->current_mem_ctx, sys_inet_ntoa(in)); NT_STATUS_HAVE_NO_MEMORY(*address); return NT_STATUS_OK; } @@ -802,7 +802,7 @@ NTSTATUS ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flags, DATA_BLOB *blob NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &length)); } NDR_PULL_NEED_BYTES(ndr, length); - *blob = data_blob_talloc(ndr, ndr->data+ndr->offset, length); + *blob = data_blob_talloc(ndr->current_mem_ctx, ndr->data+ndr->offset, length); ndr->offset += length; return NT_STATUS_OK; } |