diff options
| author | Anderson Lizardo <anderson.lizardo@openbossa.org> | 2013-01-05 20:47:46 -0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-01-06 14:48:50 -0800 |
| commit | c13aad78bce6fb17f44519b798d14b836e8244b1 (patch) | |
| tree | d70899fb3bbd2e38b78fc1e6e3c255f4693753d6 /gdbus | |
| parent | 827a60776641779d5089ce9dda8fc3c8bd027802 (diff) | |
| download | connman-c13aad78bce6fb17f44519b798d14b836e8244b1.tar.gz connman-c13aad78bce6fb17f44519b798d14b836e8244b1.tar.bz2 connman-c13aad78bce6fb17f44519b798d14b836e8244b1.zip | |
gdbus: Fix memory leak on properties_set()
The pointer returned by dbus_message_iter_get_signature() must be freed
with dbus_free().
Fixes this memory leak:
==1857== 16 bytes in 1 blocks are definitely lost in loss record 104 of
251
==1857== at 0x402BF52: realloc (in
/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so)
==1857== by 0x415E286: dbus_realloc (in
/lib/i386-linux-gnu/libdbus-1.so.3.5.8)
==1857== by 0x415E70B: ??? (in
/lib/i386-linux-gnu/libdbus-1.so.3.5.8)
==1857== by 0x415F17B: ??? (in
/lib/i386-linux-gnu/libdbus-1.so.3.5.8)
==1857== by 0x414CB33: dbus_message_iter_get_signature (in
/lib/i386-linux-gnu/libdbus-1.so.3.5.8)
==1857== by 0x8053239: properties_set (object.c:899)
==1857== by 0x5FFFFF: ???
==1857==
Diffstat (limited to 'gdbus')
| -rw-r--r-- | gdbus/object.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index 688cd059..1a54b3f7 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -846,6 +846,8 @@ static DBusMessage *properties_set(DBusConnection *connection, const GDBusPropertyTable *property; const char *name, *interface; struct property_data *propdata; + gboolean valid_signature; + char *signature; if (!dbus_message_iter_init(message, &iter)) return g_dbus_create_error(message, DBUS_ERROR_INVALID_ARGS, @@ -896,7 +898,10 @@ static DBusMessage *properties_set(DBusConnection *connection, DBUS_ERROR_UNKNOWN_PROPERTY, "No such property '%s'", name); - if (strcmp(dbus_message_iter_get_signature(&sub), property->type)) + signature = dbus_message_iter_get_signature(&sub); + valid_signature = strcmp(signature, property->type) ? FALSE : TRUE; + dbus_free(signature); + if (!valid_signature) return g_dbus_create_error(message, DBUS_ERROR_INVALID_SIGNATURE, "Invalid signature for '%s'", name); |