r3054: use talloc_zero_array_p() in a couple of places

(This used to be commit cccd59009d54d63ccf57181c15d161998a15da6b)

diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c
index 0150eff0fa9ca195c985b24b1f2c5abe91d021f2..9e2b16c30e41fe19ed0858a9b36cabe57d73e6b5 100644 (file)
--- 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_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);
        }
        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 7954673a6411047e5a2043f37674d1c1fa330e87..ed58791fbeabc56bb2f983a54cddd85f18327302 100644 (file)
--- 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_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);
        }
        trans->out.params = data_blob_talloc(req, NULL, param_size);
        trans->out.data = data_blob_talloc(req, NULL, data_size);