diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-02-07 00:21:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:44:45 -0500 |
| commit | 21650cf3779f20aad808f8ce4e95daa7a2d0e1e7 (patch) | |
| tree | 5c8ffd34aaf5c66de67c15f421fba4b9f4cf28b7 /source4/libcli/raw/rawtrans.c | |
| parent | 6d7039026c9b6f077f3d2453fb9381be32f332f8 (diff) | |
| download | samba-21650cf3779f20aad808f8ce4e95daa7a2d0e1e7.tar.gz samba-21650cf3779f20aad808f8ce4e95daa7a2d0e1e7.tar.bz2 samba-21650cf3779f20aad808f8ce4e95daa7a2d0e1e7.zip | |
r21206: - a couple more nttrans places were a memcpy() should be used
- changed the setup array in nttrans to be a uint8 array, instead of a
uint16 array. This makes it clearer that it is the job of the caller
to do any byte swapping within that data
(This used to be commit fa3c9b29ae1c7c6a9bc97484cc386aeec9b5d266)
Diffstat (limited to 'source4/libcli/raw/rawtrans.c')
| -rw-r--r-- | source4/libcli/raw/rawtrans.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/libcli/raw/rawtrans.c b/source4/libcli/raw/rawtrans.c index 08d7483a87..164354c701 100644 --- a/source4/libcli/raw/rawtrans.c +++ b/source4/libcli/raw/rawtrans.c @@ -449,15 +449,14 @@ NTSTATUS smb_raw_nttrans_recv(struct smbcli_request *req, SMBCLI_CHECK_WCT(req, 18 + parms->out.setup_count); if (parms->out.setup_count > 0) { - int i; - parms->out.setup = talloc_array(mem_ctx, uint16_t, parms->out.setup_count); + parms->out.setup = talloc_array(mem_ctx, uint8_t, + parms->out.setup_count*2); if (!parms->out.setup) { req->status = NT_STATUS_NO_MEMORY; return smbcli_request_destroy(req); } - for (i=0;i<parms->out.setup_count;i++) { - parms->out.setup[i] = SVAL(req->in.vwv, VWV(18+i)); - } + memcpy(parms->out.setup, VWV(18) + (uint8_t *)req->out.vwv, + sizeof(uint16_t) * parms->out.setup_count); } while (recvd_data < total_data || |