From nobody Tue Feb 10 09:45:08 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547507485694470.3581270969971; Mon, 14 Jan 2019 15:11:25 -0800 (PST) Received: from localhost ([127.0.0.1]:34098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjBO6-00025h-Lz for importer@patchew.org; Mon, 14 Jan 2019 18:11:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjB6k-0004Bd-Uo for qemu-devel@nongnu.org; Mon, 14 Jan 2019 17:53:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjB6h-0001Cc-Qd for qemu-devel@nongnu.org; Mon, 14 Jan 2019 17:53:24 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:37260) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjB6h-0001AJ-HG for qemu-devel@nongnu.org; Mon, 14 Jan 2019 17:53:23 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id CDB991BC0; Mon, 14 Jan 2019 23:53:19 +0100 (CET) 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 ik_aaZleJuHe; Mon, 14 Jan 2019 23:53:18 +0100 (CET) Received: from function.home (lfbn-1-11161-124.w86-213.abo.wanadoo.fr [86.213.235.124]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 6EF171BC2; Mon, 14 Jan 2019 23:53:10 +0100 (CET) Received: from samy by function.home with local (Exim 4.92-RC4) (envelope-from ) id 1gjB6S-0005dx-RV; Mon, 14 Jan 2019 23:53:08 +0100 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 23:52:11 +0100 Message-Id: <20190114225306.21569-11-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190114225306.21569-1-samuel.thibault@ens-lyon.org> References: <20190114225306.21569-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PULL 10/65] slirp: replace the poor-man string split with g_strsplit() 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau Use the glib function for the work, fix a potential crash on >256 words. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Samuel Thibault --- slirp/misc.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/slirp/misc.c b/slirp/misc.c index ce323ef92e..4840187750 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -88,11 +88,8 @@ fork_exec(struct socket *so, const char *ex) socklen_t addrlen =3D sizeof(addr); socklen_t csaddrlen =3D sizeof(csaddr); int opt; - const char *argv[256]; - /* don't want to clobber the original */ - char *bptr; - const char *curarg; - int c, i, ret; + char **argv; + int ret; pid_t pid; =20 DEBUG_CALL("fork_exec"); @@ -156,19 +153,7 @@ fork_exec(struct socket *so, const char *ex) for (s =3D getdtablesize() - 1; s >=3D 3; s--) close(s); =20 - i =3D 0; - bptr =3D g_strdup(ex); /* No need to free() this */ - do { - /* Change the string into argv[] */ - curarg =3D bptr; - while (*bptr !=3D ' ' && *bptr !=3D (char)0) - bptr++; - c =3D *bptr; - *bptr++ =3D (char)0; - argv[i++] =3D g_strdup(curarg); - } while (c); - - argv[i] =3D NULL; + argv =3D g_strsplit(ex, " ", -1); execvp(argv[0], (char **)argv); =20 /* Ooops, failed, let's tell the user why */ --=20 2.20.1