From f3f6bfafbe5634fac1b187634517c5b592d99788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Fri, 26 Nov 2021 10:43:24 -0600 Subject: agent: Clear the original message pointer instead of a copy In one case, the message pointer gets replaced by the rfc4571_message one, so it wasn't getting cleared as expected. --- agent/agent.c | 4 ++-- tests/test-send-recv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/agent.c b/agent/agent.c index a309f44..c552115 100644 --- a/agent/agent.c +++ b/agent/agent.c @@ -4557,8 +4557,8 @@ done: } /* Clear local modifications. */ - if (message->from == &from) { - message->from = NULL; + if (provided_message->from == &from) { + provided_message->from = NULL; } return retval; diff --git a/tests/test-send-recv.c b/tests/test-send-recv.c index dfc639f..2a86426 100644 --- a/tests/test-send-recv.c +++ b/tests/test-send-recv.c @@ -689,7 +689,7 @@ read_thread_agent_cb (GInputStream *input_stream, TestIOStreamThreadData *data) while (test_data->received_bytes < test_data->n_bytes) { GError *error = NULL; - NiceInputMessage *messages; + NiceInputMessage *messages = {0}; guint n_messages; gint n_valid_messages; -- cgit v1.2.1