Patchwork [PULL,11/15] iov: avoid "orig_len may be used unitialized" warning

login
register
mail settings
Submitter Michael Tokarev
Date Sept. 14, 2013, 7:47 p.m.
Message ID <1379188061-7634-12-git-send-email-mjt@msgid.tls.msk.ru>
Download mbox | patch
Permalink /patch/274945/
State New
Headers show

Comments

Michael Tokarev - Sept. 14, 2013, 7:47 p.m.
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 util/iov.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Patch

diff --git a/util/iov.c b/util/iov.c
index f705586..bb46c04 100644
--- a/util/iov.c
+++ b/util/iov.c
@@ -181,13 +181,11 @@  ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt,
             assert(iov[niov].iov_len > tail);
             orig_len = iov[niov].iov_len;
             iov[niov++].iov_len = tail;
-        }
-
-        ret = do_send_recv(sockfd, iov, niov, do_send);
-
-        /* Undo the changes above before checking for errors */
-        if (tail) {
+            ret = do_send_recv(sockfd, iov, niov, do_send);
+            /* Undo the changes above before checking for errors */
             iov[niov-1].iov_len = orig_len;
+        } else {
+            ret = do_send_recv(sockfd, iov, niov, do_send);
         }
         if (offset) {
             iov[0].iov_base -= offset;