From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:37999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDS9e-0000y3-B2 for qemu-devel@nongnu.org; Mon, 08 Apr 2019 07:09:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDS9d-0001p0-Dv for qemu-devel@nongnu.org; Mon, 08 Apr 2019 07:09:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50596) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hDS9b-0001n7-FJ for qemu-devel@nongnu.org; Mon, 08 Apr 2019 07:09:31 -0400 From: Thomas Huth Date: Mon, 8 Apr 2019 13:09:20 +0200 Message-Id: <20190408110920.30119-4-thuth@redhat.com> In-Reply-To: <20190408110920.30119-1-thuth@redhat.com> References: <20190408110920.30119-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/3] test qgraph.c: Fix segs due to out of scope default List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Laurent Vivier , Paolo Bonzini , Jafar Abdi , dgilbert@redhat.com From: "Dr. David Alan Gilbert" The test uses the trick: if (!opts) { opts =3D &(QOSGraph...Options) { }; } in a couple of places, however the temporary created by the &() {} goes out of scope at the bottom of the if, and results in a seg or assert when opts-> fields are used (on fedora 30's gcc 9). Fixes: fc281c802022cb3a73a5 Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Eric Blake Message-Id: <20190405184037.16799-1-dgilbert@redhat.com> Signed-off-by: Thomas Huth --- tests/libqos/qgraph.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/libqos/qgraph.c b/tests/libqos/qgraph.c index 122efc1b7b..b149caaaa9 100644 --- a/tests/libqos/qgraph.c +++ b/tests/libqos/qgraph.c @@ -77,6 +77,7 @@ static void add_edge(const char *source, const char *de= st, { char *key; QOSGraphEdgeList *list =3D g_hash_table_lookup(edge_table, source); + QOSGraphEdgeOptions def_opts =3D { }; =20 if (!list) { list =3D g_new0(QOSGraphEdgeList, 1); @@ -85,7 +86,7 @@ static void add_edge(const char *source, const char *de= st, } =20 if (!opts) { - opts =3D &(QOSGraphEdgeOptions) { }; + opts =3D &def_opts; } =20 QOSGraphEdge *edge =3D g_new0(QOSGraphEdge, 1); @@ -590,9 +591,10 @@ void qos_add_test(const char *name, const char *inte= rface, { QOSGraphNode *node; char *test_name =3D g_strdup_printf("%s-tests/%s", interface, name);= ; + QOSGraphTestOptions def_opts =3D { }; =20 if (!opts) { - opts =3D &(QOSGraphTestOptions) { }; + opts =3D &def_opts; } node =3D create_node(test_name, QNODE_TEST); node->u.test.function =3D test_func; --=20 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EED6AC282CE for ; Mon, 8 Apr 2019 11:11:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C253C20863 for ; Mon, 8 Apr 2019 11:11:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C253C20863 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:51212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDSBD-0001zf-VO for qemu-devel@archiver.kernel.org; Mon, 08 Apr 2019 07:11:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDS9e-0000y3-B2 for qemu-devel@nongnu.org; Mon, 08 Apr 2019 07:09:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDS9d-0001p0-Dv for qemu-devel@nongnu.org; Mon, 08 Apr 2019 07:09:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50596) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hDS9b-0001n7-FJ for qemu-devel@nongnu.org; Mon, 08 Apr 2019 07:09:31 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 293F488AAC; Mon, 8 Apr 2019 11:09:30 +0000 (UTC) Received: from thuth.com (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id C61BB1A90F; Mon, 8 Apr 2019 11:09:28 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 8 Apr 2019 13:09:20 +0200 Message-Id: <20190408110920.30119-4-thuth@redhat.com> In-Reply-To: <20190408110920.30119-1-thuth@redhat.com> References: <20190408110920.30119-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 08 Apr 2019 11:09:30 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/3] test qgraph.c: Fix segs due to out of scope default 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: Laurent Vivier , Paolo Bonzini , Jafar Abdi , dgilbert@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190408110920.k22xg3AYkUH4eEhXjH0wsyNOlXSbhCECTSmHlBCc4oE@z> From: "Dr. David Alan Gilbert" The test uses the trick: if (!opts) { opts =3D &(QOSGraph...Options) { }; } in a couple of places, however the temporary created by the &() {} goes out of scope at the bottom of the if, and results in a seg or assert when opts-> fields are used (on fedora 30's gcc 9). Fixes: fc281c802022cb3a73a5 Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Eric Blake Message-Id: <20190405184037.16799-1-dgilbert@redhat.com> Signed-off-by: Thomas Huth --- tests/libqos/qgraph.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/libqos/qgraph.c b/tests/libqos/qgraph.c index 122efc1b7b..b149caaaa9 100644 --- a/tests/libqos/qgraph.c +++ b/tests/libqos/qgraph.c @@ -77,6 +77,7 @@ static void add_edge(const char *source, const char *de= st, { char *key; QOSGraphEdgeList *list =3D g_hash_table_lookup(edge_table, source); + QOSGraphEdgeOptions def_opts =3D { }; =20 if (!list) { list =3D g_new0(QOSGraphEdgeList, 1); @@ -85,7 +86,7 @@ static void add_edge(const char *source, const char *de= st, } =20 if (!opts) { - opts =3D &(QOSGraphEdgeOptions) { }; + opts =3D &def_opts; } =20 QOSGraphEdge *edge =3D g_new0(QOSGraphEdge, 1); @@ -590,9 +591,10 @@ void qos_add_test(const char *name, const char *inte= rface, { QOSGraphNode *node; char *test_name =3D g_strdup_printf("%s-tests/%s", interface, name);= ; + QOSGraphTestOptions def_opts =3D { }; =20 if (!opts) { - opts =3D &(QOSGraphTestOptions) { }; + opts =3D &def_opts; } node =3D create_node(test_name, QNODE_TEST); node->u.test.function =3D test_func; --=20 2.21.0