From: Maxim Levitsky Date: Mon, 19 Oct 2020 16:37:01 +0000 (+0300) Subject: libqtest: fix memory leak in the qtest_qmp_event_ref X-Git-Tag: v5.2.0-rc0~36^2~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d232b87ec6e3a8a04db9b647f61a1e3a6855a58f;p=thirdparty%2Fqemu.git libqtest: fix memory leak in the qtest_qmp_event_ref The g_list_remove_link doesn't free the link element, opposed to what I thought. Switch to g_list_delete_link that does free it. Also refactor the code a bit. Thanks for Max Reitz for helping me with this. Signed-off-by: Maxim Levitsky Message-Id: <20201019163702.471239-4-mlevitsk@redhat.com> Signed-off-by: Thomas Huth --- diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 0e304bdbd15..99deff47efc 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -795,15 +795,12 @@ void qtest_qmp_send_raw(QTestState *s, const char *fmt, ...) QDict *qtest_qmp_event_ref(QTestState *s, const char *event) { - GList *next = NULL; - QDict *response; - - for (GList *it = s->pending_events; it != NULL; it = next) { + while (s->pending_events) { - next = it->next; - response = (QDict *)it->data; + GList *first = s->pending_events; + QDict *response = (QDict *)first->data; - s->pending_events = g_list_remove_link(s->pending_events, it); + s->pending_events = g_list_delete_link(s->pending_events, first); if (!strcmp(qdict_get_str(response, "event"), event)) { return response;