From 370dedffbb070815f0d55892cba812732d337e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 1 Apr 2017 16:23:06 +0200 Subject: [PATCH] Fix memory leaks in sendWithReplyAsync MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 9d505d268352b7776a80dc91b7e49fc4c73a5e73) --- tqdbusintegrator.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tqdbusintegrator.cpp b/tqdbusintegrator.cpp index ef3b76f..83af8e7 100644 --- a/tqdbusintegrator.cpp +++ b/tqdbusintegrator.cpp @@ -291,6 +291,16 @@ TQT_DBusConnectionPrivate::TQT_DBusConnectionPrivate(TQObject *parent) TQT_DBusConnectionPrivate::~TQT_DBusConnectionPrivate() { + for (PendingCallMap::iterator it = pendingCalls.begin(); it != pendingCalls.end();) + { + PendingCallMap::iterator copyIt = it; + ++it; + dbus_pending_call_cancel(copyIt.key()); + dbus_pending_call_unref(copyIt.key()); + delete copyIt.data(); + pendingCalls.erase(copyIt); + } + if (dbus_error_is_set(&error)) dbus_error_free(&error); @@ -629,20 +639,22 @@ int TQT_DBusConnectionPrivate::sendWithReplyAsync(const TQT_DBusMessage &message if (!msg) return 0; + int msg_serial = 0; DBusPendingCall *pending = 0; if (dbus_connection_send_with_reply(connection, msg, &pending, message.timeout())) { TQT_DBusPendingCall *pcall = new TQT_DBusPendingCall; pcall->receiver = receiver; pcall->method = method; - pcall->pending = dbus_pending_call_ref(pending); + pcall->pending = pending; pendingCalls.insert(pcall->pending, pcall); dbus_pending_call_set_notify(pending, qDBusResultReceived, this, 0); - return dbus_message_get_serial(msg); + msg_serial = dbus_message_get_serial(msg); } - return 0; + dbus_message_unref(msg); + return msg_serial; } void TQT_DBusConnectionPrivate::flush()