diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-07 04:39:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:30 -0500 |
| commit | 11ce2cfd70df264c5c91b4daaa9a01c5abc673b0 (patch) | |
| tree | f00bf95389509ca8655f3b1cf1dfec76289790b3 /source4/librpc/rpc | |
| parent | 066134f2414e8688fd980b619f9e597538c8766d (diff) | |
| download | samba-11ce2cfd70df264c5c91b4daaa9a01c5abc673b0.tar.gz samba-11ce2cfd70df264c5c91b4daaa9a01c5abc673b0.tar.bz2 samba-11ce2cfd70df264c5c91b4daaa9a01c5abc673b0.zip | |
r4591: - converted the other _p talloc functions to not need _p
- added #if TALLOC_DEPRECATED around the _p functions
- fixes the code that broke from the above
while doing this I fixed quite a number of places that were
incorrectly using the non type-safe talloc functions to use the type
safe ones. Some were even doing multiplies for array allocation, which
is potentially unsafe.
(This used to be commit 6e7754abd0c225527fb38363996a6e241b87b37e)
Diffstat (limited to 'source4/librpc/rpc')
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 1 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_smb.c | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_sock.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 9a8de8c0ad..ee7250a4f9 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -811,6 +811,7 @@ static void dcerpc_request_recv_data(struct dcerpc_pipe *p, if (length > 0) { req->payload.data = talloc_realloc(req, req->payload.data, + uint8_t, req->payload.length + length); if (!req->payload.data) { req->status = NT_STATUS_NO_MEMORY; diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c index d04b067eeb..ab8a60b060 100644 --- a/source4/librpc/rpc/dcerpc_smb.c +++ b/source4/librpc/rpc/dcerpc_smb.c @@ -94,7 +94,7 @@ static void smb_read_callback(struct smbcli_request *req) } /* initiate another read request, as we only got part of a fragment */ - state->data.data = talloc_realloc(state, state->data.data, frag_length); + state->data.data = talloc_realloc(state, state->data.data, uint8_t, frag_length); io->readx.in.mincnt = MIN(state->p->srv_max_xmit_frag, frag_length - state->received); diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c index 8de43d8454..762a22ad3e 100644 --- a/source4/librpc/rpc/dcerpc_sock.c +++ b/source4/librpc/rpc/dcerpc_sock.c @@ -151,7 +151,7 @@ static void sock_process_recv(struct dcerpc_pipe *p) frag_length = dcerpc_get_frag_length(&sock->recv.data); sock->recv.data.data = talloc_realloc(sock, sock->recv.data.data, - frag_length); + uint8_t, frag_length); if (sock->recv.data.data == NULL) { sock_dead(p, NT_STATUS_NO_MEMORY); return; |