mesh: Fix memory leak on dbus message creation
PATCH 1/1 mesh: Fix memory leak on dbus message creation
--- mesh/model.c | 3 +++ 1 file changed, 3 insertions(+)
mesh/model.c +3 -0
@@ -729,10 +729,13 @@ static void send_msg_rcvd(struct mesh_node *node, uint8_t ele_idx, bool is_sub,if (!l_dbus_message_builder_finalize (builder)) goto error; +l_dbus_message_builder_destroy (builder);l_dbus_send (dbus, msg); +return ; error:l_dbus_message_builder_destroy (builder); +l_dbus_message_unref (msg); } bool mesh_model_rx(struct mesh_node *node, bool szmict, uint32_t seq0,
Signature · 1 line
2.14.5
Hi,
Quoted 12 lines · Brian Gix
--- mesh/model.c | 3 +++ 1 file changed, 3 insertions(+)mesh/model.c +0
-0@@ -729,10 +729,13 @@ static void send_msg_rcvd(struct mesh_node *node, uint8_t ele_idx, bool is_sub,if (!l_dbus_message_builder_finalize (builder)) goto error;
mesh/model.c static void send_msg_rcvd(struct mesh_node *node, uint8_t ele_idx, bool is_sub, · line 741
Quoted 10 lines
mesh/model.c +3
-0+l_dbus_message_builder_destroy (builder);l_dbus_send (dbus, msg); +return ; error:l_dbus_message_builder_destroy (builder); +l_dbus_message_unref (msg); } bool mesh_model_rx(struct mesh_node *node, bool szmict, uint32_t seq0,
Since in ELL's dbus API it's legal to unref a NULL message, I'd rather write this as:
l_dbus_send(dbus, msg);
msg = NULL;error:
l_dbus_message_builder_destroy(builder);
l_dbus_message_unref(msg);or (version for purists):
l_dbus_send(dbus, msg);
msg = NULL;error:
l_dbus_message_builder_destroy(builder);
if (msg)
l_dbus_message_unref(msg);mostly to emphasize that l_dbus_send has "move" semantics.
Signature · 3 lines
Michał Lowas-Rzechonek <[email protected]> Silvair http://silvair.com Jasnogórska 44, 31-358 Krakow, POLAND