ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test qgraph.c: Fix segs due to out of scope default 

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: fc281c8020
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190405184037.16799-1-dgilbert@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2019-04-05 19:40:37 +01:00 committed by Thomas Huth
parent c098aac7dc
commit c19f2b711e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/libqos/qgraph.c
View File

@ -77,6 +77,7 @@ static void add_edge(const char *source, const char *dest,
{ {
char *key; char *key;
QOSGraphEdgeList *list = g_hash_table_lookup(edge_table, source); QOSGraphEdgeList *list = g_hash_table_lookup(edge_table, source);
QOSGraphEdgeOptions def_opts = { };
if (!list) { if (!list) {
list = g_new0(QOSGraphEdgeList, 1); list = g_new0(QOSGraphEdgeList, 1);
@ -85,7 +86,7 @@ static void add_edge(const char *source, const char *dest,
} }
if (!opts) { if (!opts) {
opts = &(QOSGraphEdgeOptions) { }; opts = &def_opts;
} }
QOSGraphEdge *edge = g_new0(QOSGraphEdge, 1); QOSGraphEdge *edge = g_new0(QOSGraphEdge, 1);
@ -590,9 +591,10 @@ void qos_add_test(const char *name, const char *interface,
{ {
QOSGraphNode *node; QOSGraphNode *node;
char *test_name = g_strdup_printf("%s-tests/%s", interface, name);; char *test_name = g_strdup_printf("%s-tests/%s", interface, name);;
QOSGraphTestOptions def_opts = { };
if (!opts) { if (!opts) {
opts = &(QOSGraphTestOptions) { }; opts = &def_opts;
} }
node = create_node(test_name, QNODE_TEST); node = create_node(test_name, QNODE_TEST);
node->u.test.function = test_func; node->u.test.function = test_func;