[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 11/17] iov: avoid "orig_len may be used unitialized
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 11/17] iov: avoid "orig_len may be used unitialized" warning |
Date: |
Fri, 20 Sep 2013 20:58:10 +0400 |
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
util/iov.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
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;
--
1.7.10.4
- [Qemu-trivial] [PULL 03/17] docs: Fix IO port number for CPU present bitmap., (continued)
- [Qemu-trivial] [PULL 03/17] docs: Fix IO port number for CPU present bitmap., Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 12/17] target-i386: Fix segment cache dump, Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 13/17] Makefile: Remove some more files when cleaning, Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 16/17] exec: Fix broken build for MinGW (regression), Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 06/17] MAINTAINERS: Add missing entry to filelist for TCI target, Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 09/17] trace-events: Clean up with scripts/cleanup-trace-events.pl again, Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 05/17] translate-all: Fix formatting of dump output, Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 02/17] q35: Fix typo in constant DEFUALT -> DEFAULT., Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 04/17] *-user: Fix typo in comment (ulocking -> unlocking), Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 14/17] tcg-sparc: Fix parenthesis warning, Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 11/17] iov: avoid "orig_len may be used unitialized" warning,
Michael Tokarev <=
- [Qemu-trivial] [PULL 17/17] tests/.gitignore: ignore test-throttle, Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 08/17] tci: Fix qemu-alpha on 32 bit hosts (wrong assertions), Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 10/17] vscclient: remove unnecessary use of uninitialized variable, Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 07/17] *-user: Improve documentation for lock_user function, Michael Tokarev, 2013/09/20
- [Qemu-trivial] [PULL 15/17] kvm: Fix compiler warning (clang), Michael Tokarev, 2013/09/20