diff options
author | Volker Lendecke <vl@samba.org> | 2015-02-17 20:17:35 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2015-02-24 17:52:09 +0100 |
commit | 7bcd7e2f5ca4dd88871588239ee7d2285d6e0d83 (patch) | |
tree | 08c57f71b165b1200dbf40db61617ab342a2e0f4 /libcli | |
parent | 4c000545c00943993b5d814f14e8112abd19975f (diff) | |
download | samba-7bcd7e2f5ca4dd88871588239ee7d2285d6e0d83.tar.gz samba-7bcd7e2f5ca4dd88871588239ee7d2285d6e0d83.tar.xz samba-7bcd7e2f5ca4dd88871588239ee7d2285d6e0d83.zip |
lib: Use iov_buf in smbXcli_iov_concat
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'libcli')
-rw-r--r-- | libcli/smb/smbXcli_base.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index f8d4df3c14..b9c3c8b836 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -1126,20 +1126,21 @@ static uint8_t *smbXcli_iov_concat(TALLOC_CTX *mem_ctx, const struct iovec *iov, int count) { - size_t len = smbXcli_iov_len(iov, count); - size_t copied; + ssize_t buflen; uint8_t *buf; - int i; - buf = talloc_array(mem_ctx, uint8_t, len); - if (buf == NULL) { + buflen = iov_buflen(iov, count); + if (buflen == -1) { return NULL; } - copied = 0; - for (i=0; i<count; i++) { - memcpy(buf+copied, iov[i].iov_base, iov[i].iov_len); - copied += iov[i].iov_len; + + buf = talloc_array(mem_ctx, uint8_t, buflen); + if (buf == NULL) { + return NULL; } + + iov_buf(iov, count, buf, buflen); + return buf; } |