diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-06 03:06:58 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2005-01-06 03:06:58 +0000 |
| commit | aca6e6c4a51bbdc07a3076ed17e6011f93a20bad (patch) | |
| tree | 4c4b8de15b8011a50c2a1dad95987bbd621adca3 /source/rpc_server | |
| parent | 7c7d25cb77ea09bcf24e8635b820a70123e20cab (diff) | |
| download | samba-aca6e6c4a51bbdc07a3076ed17e6011f93a20bad.tar.gz samba-aca6e6c4a51bbdc07a3076ed17e6011f93a20bad.tar.xz samba-aca6e6c4a51bbdc07a3076ed17e6011f93a20bad.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)
Diffstat (limited to 'source/rpc_server')
| -rw-r--r-- | source/rpc_server/echo/rpc_echo.c | 3 | ||||
| -rw-r--r-- | source/rpc_server/remote/dcesrv_remote.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/rpc_server/echo/rpc_echo.c b/source/rpc_server/echo/rpc_echo.c index 543bca1073c..e5c1ee56cee 100644 --- a/source/rpc_server/echo/rpc_echo.c +++ b/source/rpc_server/echo/rpc_echo.c @@ -37,11 +37,10 @@ static NTSTATUS echo_EchoData(struct dcesrv_call_state *dce_call, TALLOC_CTX *me return NT_STATUS_OK; } - r->out.out_data = talloc(mem_ctx, r->in.len); + r->out.out_data = talloc_memdup(mem_ctx, r->in.in_data, r->in.len); if (!r->out.out_data) { return NT_STATUS_NO_MEMORY; } - memcpy(r->out.out_data, r->in.in_data, r->in.len); return NT_STATUS_OK; } diff --git a/source/rpc_server/remote/dcesrv_remote.c b/source/rpc_server/remote/dcesrv_remote.c index 3bf917ac718..8feb54a500c 100644 --- a/source/rpc_server/remote/dcesrv_remote.c +++ b/source/rpc_server/remote/dcesrv_remote.c @@ -77,7 +77,7 @@ static NTSTATUS remote_op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CT return NT_STATUS_NET_WRITE_FAULT; } - *r = talloc(mem_ctx, table->calls[opnum].struct_size); + *r = talloc_size(mem_ctx, table->calls[opnum].struct_size); if (!*r) { return NT_STATUS_NO_MEMORY; } |