summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-19 06:31:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:01:54 -0500
commit002f883202353c2ddf087face63cc1ac0be8b6ad (patch)
treee2a2f9e6dc72141401c2605d161354bc69178661
parentc5465ae50fa133d3f354f6e12a2123f09131a2e6 (diff)
downloadsamba-002f883202353c2ddf087face63cc1ac0be8b6ad.tar.gz
samba-002f883202353c2ddf087face63cc1ac0be8b6ad.tar.bz2
samba-002f883202353c2ddf087face63cc1ac0be8b6ad.zip
r3054: use talloc_zero_array_p() in a couple of places
(This used to be commit cccd59009d54d63ccf57181c15d161998a15da6b)
-rw-r--r--source4/smb_server/nttrans.c2
-rw-r--r--source4/smb_server/trans2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c
index 0150eff0fa..9e2b16c30e 100644
--- a/source4/smb_server/nttrans.c
+++ b/source4/smb_server/nttrans.c
@@ -39,7 +39,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(req, sizeof(uint16_t) * setup_count);
+ trans->out.setup = talloc_zero_array_p(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/trans2.c b/source4/smb_server/trans2.c
index 7954673a64..ed58791fbe 100644
--- a/source4/smb_server/trans2.c
+++ b/source4/smb_server/trans2.c
@@ -73,7 +73,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(req, sizeof(uint16_t) * setup_count);
+ trans->out.setup = talloc_zero_array_p(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);