Fix: do not use BT_MOVE() when the destination memory could be uninitialized

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/lib/graph/connection.c b/lib/graph/connection.c
index c7e32c071bd4d97a6641ca51038058c1883e55c5..17cefd9c2956d5e48e04cc86190e740778d2cb68 100644 (file)
--- a/lib/graph/connection.c
+++ b/lib/graph/connection.c
@@ -390,7 +390,10 @@ bt_private_connection_create_notification_iterator(
                bt_port_get_name(connection->upstream_port),
                upstream_component, bt_component_get_name(upstream_component),
                iterator);
-       BT_MOVE(*user_iterator, iterator);
+
+       /* Move reference to user */
+       *user_iterator = iterator;
+       iterator = NULL;
 
 end:
        bt_put(upstream_component);

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index 1dc7b819c9db02c69d7a3985aca4c0ebb45cfb44..10dd1944e840808e7b9669b9b8761deca26e590e 100644 (file)
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -405,7 +405,9 @@ enum bt_graph_status bt_graph_connect_ports(struct bt_graph *graph,
                downstream_port, bt_port_get_name(downstream_port));
 
        if (user_connection) {
-               BT_MOVE(*user_connection, connection);
+               /* Move reference to user */
+               *user_connection = connection;
+               connection = NULL;
        }
 
 end:

diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c
index 6d6058f5225eafcda2946bc9d4fc77352855a2b3..87fe6376309de579986cc9422e12cf66a0c3f8fc 100644 (file)
--- a/lib/graph/iterator.c
+++ b/lib/graph/iterator.c
@@ -589,7 +589,10 @@ enum bt_connection_status bt_notification_iterator_create(
                upstream_comp, bt_component_get_name(upstream_comp),
                upstream_port, bt_port_get_name(upstream_port),
                connection, iterator);
-       BT_MOVE(*user_iterator, iterator);
+
+       /* Move reference to user */
+       *user_iterator = iterator;
+       iterator = NULL;
 
 end:
        bt_put(iterator);