| commit | e911765cbb9e9ddf5d952c88bb52180a62c6cea0 | |
| author | Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> | |
| Tue, 2 Aug 2016 09:41:20 +0000 (2 12:41 +0300) | ||
| committer | Paolo Bonzini <pbonzini@redhat.com> | |
| Wed, 3 Aug 2016 16:44:57 +0000 (3 18:44 +0200) | ||
| tree | 6036cab11ada53a9aee71a0368b3487e09d1305e | treesnapshot (tar.gz zip) |
| parent | 0d4104e5760221547fad158bbbb655a4e4c22b50 | commitdiff |
util: Fix assertion in iov_copy() upon zero 'bytes' and non-zero 'offset'
In cases where iov_copy() is passed with zero 'bytes' argument and a
non-zero 'offset' argument, nothing gets copied - as expected.
However no copy iterations are performed, so 'offset' is left
unaltered, leading to the final assert(offset == 0) to fail.
Instead, change the loop condition to continue as long as 'offset || bytes',
similar to other iov_* functions.
This ensures 'offset' gets zeroed (even if no actual copy is made),
unless it is beyond end of source iov - which is asserted.
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
Message-Id: <1470130880-1050-1-git-send-email-shmulik.ladkani@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
In cases where iov_copy() is passed with zero 'bytes' argument and a
non-zero 'offset' argument, nothing gets copied - as expected.
However no copy iterations are performed, so 'offset' is left
unaltered, leading to the final assert(offset == 0) to fail.
Instead, change the loop condition to continue as long as 'offset || bytes',
similar to other iov_* functions.
This ensures 'offset' gets zeroed (even if no actual copy is made),
unless it is beyond end of source iov - which is asserted.
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
Message-Id: <1470130880-1050-1-git-send-email-shmulik.ladkani@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| util/iov.c | diffblobblamehistory |