From a086cb867407660558b3c7ed6690738ff3240cea Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Mon, 23 Mar 2020 16:00:35 +0000 Subject: vcl: fix ldp writev 0 vecs Type: fix Signed-off-by: Florin Coras Change-Id: Iec5db8dcf3a019b731e15fd79d0208d6eb10943b (cherry picked from commit eda1b8c32f9857bb749835b0189af002b224927d) --- src/vcl/ldp.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c index a4151be9f2e..47ad0f8a9e1 100644 --- a/src/vcl/ldp.c +++ b/src/vcl/ldp.c @@ -448,24 +448,20 @@ writev (int fd, const struct iovec * iov, int iovcnt) vlsh = ldp_fd_to_vlsh (fd); if (vlsh != VLS_INVALID_HANDLE) { - do + for (i = 0; i < iovcnt; ++i) { - for (i = 0; i < iovcnt; ++i) + rv = vls_write_msg (vlsh, iov[i].iov_base, iov[i].iov_len); + if (rv < 0) + break; + else { - rv = vls_write_msg (vlsh, iov[i].iov_base, iov[i].iov_len); - if (rv < 0) + total += rv; + if (rv < iov[i].iov_len) break; - else - { - total += rv; - if (rv < iov[i].iov_len) - break; - } } } - while ((rv >= 0) && (total == 0)); - if (rv < 0) + if (rv < 0 && total == 0) { errno = -rv; size = -1; -- cgit 1.2.3-korg