On 05/04/19 20:40, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <[email protected]>
>
> The test uses the trick:
> if (!opts) {
> opts = &(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 <[email protected]>
Thomas, can you pick this up?
Paolo
> ---
> 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 *dest,
> {
> char *key;
> QOSGraphEdgeList *list = g_hash_table_lookup(edge_table, source);
> + QOSGraphEdgeOptions def_opts = { };
>
> if (!list) {
> list = g_new0(QOSGraphEdgeList, 1);
> @@ -85,7 +86,7 @@ static void add_edge(const char *source, const char *dest,
> }
>
> if (!opts) {
> - opts = &(QOSGraphEdgeOptions) { };
> + opts = &def_opts;
> }
>
> QOSGraphEdge *edge = g_new0(QOSGraphEdge, 1);
> @@ -590,9 +591,10 @@ void qos_add_test(const char *name, const char
> *interface,
> {
> QOSGraphNode *node;
> char *test_name = g_strdup_printf("%s-tests/%s", interface, name);;
> + QOSGraphTestOptions def_opts = { };
>
> if (!opts) {
> - opts = &(QOSGraphTestOptions) { };
> + opts = &def_opts;
> }
> node = create_node(test_name, QNODE_TEST);
> node->u.test.function = test_func;
>
