From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:57947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG0YY-0000Q3-6c for qemu-devel@nongnu.org; Mon, 15 Apr 2019 08:17:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG0YW-0001bx-58 for qemu-devel@nongnu.org; Mon, 15 Apr 2019 08:17:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37382) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hG0YS-0001bG-FG for qemu-devel@nongnu.org; Mon, 15 Apr 2019 08:17:46 -0400 From: "Dr. David Alan Gilbert (git)" Date: Mon, 15 Apr 2019 13:17:40 +0100 Message-Id: <20190415121740.9881-1-dgilbert@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3] slirp: Gcc 9 -O3 fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, samuel.thibault@gnu.org, jan.kiszka@siemens.com From: "Dr. David Alan Gilbert" 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 --- slirp/src/socket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slirp/src/socket.c b/slirp/src/socket.c index 4a3c935e25..bb752fdcae 100644 --- a/slirp/src/socket.c +++ b/slirp/src/socket.c @@ -171,6 +171,7 @@ int soread(struct socket *so) { int n, nn; + size_t buf_len; struct sbuf *sb =3D &so->so_snd; struct iovec iov[2]; =20 @@ -181,7 +182,8 @@ soread(struct socket *so) * No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ - sopreprbuf(so, iov, &n); + buf_len =3D sopreprbuf(so, iov, &n); + assert(buf_len !=3D 0); =20 nn =3D recv(so->s, iov[0].iov_base, iov[0].iov_len,0); if (nn <=3D 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. * soread wouldn't have been called if there weren't */ + assert(size > 0); if (sopreprbuf(so, iov, &n) < size) goto err; =20 --=20 2.21.0