diff options
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/nttrans.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/reply.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/request.c | 5 | ||||
| -rw-r--r-- | source4/smb_server/smb_server.c | 3 | ||||
| -rw-r--r-- | source4/smb_server/trans2.c | 5 |
5 files changed, 10 insertions, 7 deletions
diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c index 0ab9c9ce2e..5875554258 100644 --- a/source4/smb_server/nttrans.c +++ b/source4/smb_server/nttrans.c @@ -42,7 +42,7 @@ static void nttrans_setup_reply(struct smbsrv_request *req, { trans->out.setup_count = setup_count; if (setup_count != 0) { - trans->out.setup = talloc_zero_array_p(req, uint16_t, setup_count); + trans->out.setup = talloc_zero_array(req, uint16_t, setup_count); } trans->out.params = data_blob_talloc(req, NULL, param_size); trans->out.data = data_blob_talloc(req, NULL, data_size); diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c index 0b49512663..2dfa3726e2 100644 --- a/source4/smb_server/reply.c +++ b/source4/smb_server/reply.c @@ -2377,7 +2377,7 @@ void reply_sendtxt(struct smbsrv_request *req) void reply_special(struct smbsrv_request *req) { uint8_t msg_type; - uint8_t *buf = talloc_zero_array_p(req, uint8_t, 4); + uint8_t *buf = talloc_zero_array(req, uint8_t, 4); msg_type = CVAL(req->in.buffer,0); diff --git a/source4/smb_server/request.c b/source4/smb_server/request.c index bd33e8cfc7..2ac832b439 100644 --- a/source4/smb_server/request.c +++ b/source4/smb_server/request.c @@ -83,7 +83,8 @@ static void req_setup_chain_reply(struct smbsrv_request *req, uint_t wct, uint_t /* over allocate by a small amount */ req->out.allocated = req->out.size + REQ_OVER_ALLOCATION; - req->out.buffer = talloc_realloc(req, req->out.buffer, req->out.allocated); + req->out.buffer = talloc_realloc(req, req->out.buffer, + uint8_t, req->out.allocated); if (!req->out.buffer) { smbsrv_terminate_connection(req->smb_conn, "allocation failed"); return; @@ -236,7 +237,7 @@ static void req_grow_allocation(struct smbsrv_request *req, uint_t new_size) /* we need to realloc */ req->out.allocated = req->out.size + delta + REQ_OVER_ALLOCATION; - buf2 = talloc_realloc(req, req->out.buffer, req->out.allocated); + buf2 = talloc_realloc(req, req->out.buffer, uint8_t, req->out.allocated); if (buf2 == NULL) { smb_panic("out of memory in req_grow_allocation"); } diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 2ebb927f1e..0e845b9697 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -108,7 +108,8 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct t /* when we have a full NBT header, then allocate the packet */ if (req->in.size == NBT_HDR_SIZE) { len = smb_len(req->in.buffer) + NBT_HDR_SIZE; - req->in.buffer = talloc_realloc(req, req->in.buffer, len); + req->in.buffer = talloc_realloc(req, req->in.buffer, + uint8_t, len); if (req->in.buffer == NULL) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c index 8aa60daa6d..2b9573383f 100644 --- a/source4/smb_server/trans2.c +++ b/source4/smb_server/trans2.c @@ -42,7 +42,8 @@ static BOOL trans2_grow_data_allocation(struct smbsrv_request *req, if (new_size <= trans->out.data.length) { return True; } - trans->out.data.data = talloc_realloc(req, trans->out.data.data, new_size); + trans->out.data.data = talloc_realloc(req, trans->out.data.data, + uint8_t, new_size); return (trans->out.data.data != NULL); } @@ -83,7 +84,7 @@ static void trans2_setup_reply(struct smbsrv_request *req, { trans->out.setup_count = setup_count; if (setup_count != 0) { - trans->out.setup = talloc_zero_array_p(req, uint16_t, setup_count); + trans->out.setup = talloc_zero_array(req, uint16_t, setup_count); } trans->out.params = data_blob_talloc(req, NULL, param_size); trans->out.data = data_blob_talloc(req, NULL, data_size); |