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/smb_server | |
| 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/smb_server')
| -rw-r--r-- | source4/smb_server/reply.c | 6 | ||||
| -rw-r--r-- | source4/smb_server/request.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/search.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c index 980f48bf57..0b49512663 100644 --- a/source4/smb_server/reply.c +++ b/source4/smb_server/reply.c @@ -45,7 +45,7 @@ /* useful wrapper for talloc with NO_MEMORY reply */ #define REQ_TALLOC(ptr, size) do { \ - ptr = talloc(req, size); \ + ptr = talloc_size(req, size); \ if (!ptr) { \ req_reply_error(req, NT_STATUS_NO_MEMORY); \ return; \ @@ -696,7 +696,7 @@ void reply_readbraw(struct smbsrv_request *req) /* before calling the backend we setup the raw buffer. This * saves a copy later */ req->out.size = io.readbraw.in.maxcnt + NBT_HDR_SIZE; - req->out.buffer = talloc(req, req->out.size); + req->out.buffer = talloc_size(req, req->out.size); if (req->out.buffer == NULL) { goto failed; } @@ -720,7 +720,7 @@ void reply_readbraw(struct smbsrv_request *req) failed: /* any failure in readbraw is equivalent to reading zero bytes */ req->out.size = 4; - req->out.buffer = talloc(req, req->out.size); + req->out.buffer = talloc_size(req, req->out.size); SIVAL(req->out.buffer, 0, 0); /* init NBT header */ req_send_reply_nosign(req); diff --git a/source4/smb_server/request.c b/source4/smb_server/request.c index 417d5fbcfc..bd33e8cfc7 100644 --- a/source4/smb_server/request.c +++ b/source4/smb_server/request.c @@ -120,7 +120,7 @@ void req_setup_reply(struct smbsrv_request *req, uint_t wct, uint_t buflen) /* over allocate by a small amount */ req->out.allocated = req->out.size + REQ_OVER_ALLOCATION; - req->out.buffer = talloc(req, req->out.allocated); + req->out.buffer = talloc_size(req, req->out.allocated); if (!req->out.buffer) { smbsrv_terminate_connection(req->smb_conn, "allocation failed"); return; diff --git a/source4/smb_server/search.c b/source4/smb_server/search.c index b017c996ef..3ec66a0f33 100644 --- a/source4/smb_server/search.c +++ b/source4/smb_server/search.c @@ -45,7 +45,7 @@ /* useful wrapper for talloc with NO_MEMORY reply */ #define REQ_TALLOC(ptr) do { \ - ptr = talloc(req, sizeof(*(ptr))); \ + ptr = talloc_size(req, sizeof(*(ptr))); \ if (!ptr) { \ req_reply_error(req, NT_STATUS_NO_MEMORY); \ return; \ |