diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-06 03:06:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:25 -0500 |
| commit | ddc10d4d37984246a6547e34a32d629c689c40d1 (patch) | |
| tree | bba9f8756de8fe38a6926edd0802aeff25abe0cf /source4/librpc | |
| parent | 0b54d9236fad72527ed1bcf4236767a09090d304 (diff) | |
| download | samba-ddc10d4d37984246a6547e34a32d629c689c40d1.tar.gz samba-ddc10d4d37984246a6547e34a32d629c689c40d1.tar.bz2 samba-ddc10d4d37984246a6547e34a32d629c689c40d1.zip | |
r4549: got rid of a lot more uses of plain talloc(), instead using
talloc_size() or talloc_array_p() where appropriate.
also fixed a memory leak in pvfs_copy_file() (failed to free a memory
context)
(This used to be commit 89b74b53546e1570b11b3702f40bee58aed8c503)
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/ndr/ndr.c | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 44915bac5b..9ec22cdb79 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -128,7 +128,7 @@ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx) ndr->flags = 0; ndr->alloc_size = NDR_BASE_MARSHALL_SIZE; - ndr->data = talloc(ndr, ndr->alloc_size); + ndr->data = talloc_array_p(ndr, uint8_t, ndr->alloc_size); if (!ndr->data) { return NULL; } diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 3fe2d87475..9a8de8c0ad 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -1032,7 +1032,7 @@ static NTSTATUS dcerpc_ndr_validate_in(struct dcerpc_pipe *p, NTSTATUS status; DATA_BLOB blob2; - st = talloc(mem_ctx, struct_size); + st = talloc_size(mem_ctx, struct_size); if (!st) { return NT_STATUS_NO_MEMORY; } @@ -1096,7 +1096,7 @@ static NTSTATUS dcerpc_ndr_validate_out(struct dcerpc_pipe *p, NTSTATUS status; DATA_BLOB blob, blob2; - st = talloc(mem_ctx, struct_size); + st = talloc_size(mem_ctx, struct_size); if (!st) { return NT_STATUS_NO_MEMORY; } |