Merge lp:~sbte/bamf/fix-memory-leak into lp:bamf/0.4

[Sven Baars]

This should fix

==1994== 49 (16 direct, 33 indirect) bytes in 1 blocks are definitely lost in loss record 11,086 of 25,065
==1994== at 0x4C296CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==1994== by 0x4C29857: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==1994== by 0x670D9D6: g_realloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0)
==1994== by 0x66DCB58: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0)
==1994== by 0x66DCCD3: g_array_sized_new (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0)
==1994== by 0x10EC9D96: ??? (in /usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2.2.2)
==1994== by 0x10ECAAD4: ??? (in /usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2.2.2)
==1994== by 0x10EC437C: ??? (in /usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2.2.2)
==1994== by 0x10EC769A: dbus_g_proxy_call (in /usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2.2.2)
==1994== by 0x1B0DB81E: bamf_view_get_children (in /usr/lib/x86_64-linux-gnu/libbamf3.so.0.0.0)
==1994== by 0x19EE94B3: unity::launcher::BamfLauncherIcon::EnsureWindowState() (in /usr/lib/compiz/libunityshell.so)
==1994== by 0x19EE9B87: unity::launcher::BamfLauncherIcon::BamfLauncherIcon(_BamfApplication*) (in /usr/lib/compiz/libunityshell.so)

[Mikkel Kamstrup Erlandsen (kamstrup)]

On the one!

review: Approve

[lp:~sbte/bamf/fix-memory-leak]

437. By Sven Baars on 2012-02-08

This should fix

==1994== 49 (16 direct, 33 indirect) bytes in 1 blocks are definitely lost in loss record 11,086 of 25,065
==1994== at 0x4C296CD: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==1994== by 0x4C29857: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==1994== by 0x670D9D6: g_realloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0)
==1994== by 0x66DCB58: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0)
==1994== by 0x66DCCD3: g_array_sized_new (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.3116.0)
==1994== by 0x10EC9D96: ??? (in /usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2.2.2)
==1994== by 0x10ECAAD4: ??? (in /usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2.2.2)
==1994== by 0x10EC437C: ??? (in /usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2.2.2)
==1994== by 0x10EC769A: dbus_g_proxy_call (in /usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2.2.2)
==1994== by 0x1B0DB81E: bamf_view_get_children (in /usr/lib/x86_64-linux-gnu/libbamf3.so.0.0.0)
==1994== by 0x19EE94B3: unity::launcher::BamfLauncherIcon::EnsureWindowState() (in /usr/lib/compiz/libunityshell.so)
==1994== by 0x19EE9B87: unity::launcher::BamfLauncherIcon::BamfLauncherIcon(_BamfApplication*) (in /usr/lib/compiz/libunityshell.so). Fixes: . Approved by Mikkel Kamstrup Erlandsen.

=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2012-02-07 12:35:02 +0000
+++ lib/libbamf/bamf-view.c	2012-02-07 16:04:18 +0000
@@ -170,6 +170,7 @@
                           G_TYPE_INVALID))
     {
       g_warning ("Unable to fetch children: %s\n", error->message);
+      g_error_free (error);
       return NULL;
     }