From nobody Fri Apr 26 10:55:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1555351768; cv=none; d=zoho.com; s=zohoarc; b=VXzrbro9FmduXNosmvq0tApxq4SwRM5Gx2UroZoF+lCZ/fEBt7Bqp++NomD/h1VuPypI83/ikYLMRurXNcc9W05zuLm2IAd3mb3O45bRtRv/hYxozgejGOiAcx29i0JmwHY+8Xr+ygV5emJ1hrFLs8fbDJ4kbYuuuDebFi2p/SE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555351768; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=L+loaFTCjJ3IZ2mLHtbpaZ00kBMj9tkX+HAYPwmiH2I=; b=GLEG4Dbt9CWVyMs9uP0wj6cgevDm6fTzlczSTRQkmQ4o7Vs89XkHgr/bkndpSWJAgKZTiRHHZwLCIwmEPBOrUD9I7FVuHJnLNCIai9YMC+4E4nh0GeFj0z6X2ydybTwWU8JBT2Q7mBujt/cWBaLiGosIQB5HvroXwctFmD1LiHA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555351768109382.05390827562746; Mon, 15 Apr 2019 11:09:28 -0700 (PDT) Received: from localhost ([127.0.0.1]:53965 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG62m-0001B5-6G for importer@patchew.org; Mon, 15 Apr 2019 14:09:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG5zu-0007nv-SA for qemu-devel@nongnu.org; Mon, 15 Apr 2019 14:06:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG5zt-0004KR-VC for qemu-devel@nongnu.org; Mon, 15 Apr 2019 14:06:26 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:35368) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hG5zt-0004K5-MJ for qemu-devel@nongnu.org; Mon, 15 Apr 2019 14:06:25 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id BDD78BEEA; Mon, 15 Apr 2019 20:06:24 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pbAhRydBs_9k; Mon, 15 Apr 2019 20:06:20 +0200 (CEST) Received: from function (105.251.129.77.rev.sfr.net [77.129.251.105]) by hera.aquilenet.fr (Postfix) with ESMTPSA id E7728BEE9; Mon, 15 Apr 2019 20:06:19 +0200 (CEST) Received: from samy by function with local (Exim 4.92) (envelope-from ) id 1hG5zm-0000O9-RV; Mon, 15 Apr 2019 20:06:18 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 15 Apr 2019 20:06:18 +0200 Message-Id: <20190415180618.1450-2-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190415180618.1450-1-samuel.thibault@ens-lyon.org> References: <20190415180618.1450-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULL 1/1] slirp: Gcc 9 -O3 fix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jan.kiszka@siemens.com, "Dr. David Alan Gilbert" , stefanha@redhat.com, Samuel Thibault Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 Message-Id: <20190415121740.9881-1-dgilbert@redhat.com> Signed-off-by: Samuel Thibault --- 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 s= ize) * 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.20.1