mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slirp: Gcc 9 -O3 fix

Browse Source 
Gcc 9 needs some convincing that sopreprbuf really is going to fill
in iov in the call from soreadbuf, even though the failure case
shouldn't happen.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190415121740.9881-1-dgilbert@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Dr. David Alan Gilbert 2019-04-15 13:17:40 +01:00 committed by Samuel Thibault
parent afccfc0c4c
commit 6fabae61a9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slirp/src/socket.c
View File

@ -171,6 +171,7 @@ int
soread(struct socket *so) soread(struct socket *so)
{ {
int n, nn; int n, nn;
size_t buf_len;
struct sbuf *sb = &so->so_snd; struct sbuf *sb = &so->so_snd;
struct iovec iov[2]; struct iovec iov[2];
@ -181,7 +182,8 @@ soread(struct socket *so)
* No need to check if there's enough room to read. * No need to check if there's enough room to read.
* soread wouldn't have been called if there weren't * soread wouldn't have been called if there weren't
*/ */
sopreprbuf(so, iov, &n); buf_len = sopreprbuf(so, iov, &n);
assert(buf_len != 0);
nn = recv(so->s, iov[0].iov_base, iov[0].iov_len,0); nn = recv(so->s, iov[0].iov_base, iov[0].iov_len,0);
if (nn <= 0) { if (nn <= 0) {
@ -257,6 +259,7 @@ int soreadbuf(struct socket *so, const char *buf, int size)
* No need to check if there's enough room to read. * No need to check if there's enough room to read.
* soread wouldn't have been called if there weren't * soread wouldn't have been called if there weren't
*/ */
assert(size > 0);
if (sopreprbuf(so, iov, &n) < size) if (sopreprbuf(so, iov, &n) < size)
goto err; goto err;