[cheese/wip/hans-fixes: 15/35] cheese-camera-device: Plug some memory leaks
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese/wip/hans-fixes: 15/35] cheese-camera-device: Plug some memory leaks
- Date: Fri, 14 Jun 2013 22:24:57 +0000 (UTC)
commit 17342f313cad08b20293d2e295107af9744ea14a
Author: Hans de Goede <hdegoede redhat com>
Date: Thu Jun 13 14:18:52 2013 +0200
cheese-camera-device: Plug some memory leaks
1) If we already have a format in the list, free it
2) Not only free the formats in the list, but also the actual GList structures
themselves
Signed-off-by: Hans de Goede <hdegoede redhat com>
libcheese/cheese-camera-device.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/libcheese/cheese-camera-device.c b/libcheese/cheese-camera-device.c
index 402bbb8..a12b0f7 100644
--- a/libcheese/cheese-camera-device.c
+++ b/libcheese/cheese-camera-device.c
@@ -360,6 +360,7 @@ cheese_camera_device_add_format (CheeseCameraDevice *device,
(CheeseVideoFormat *)format);
if (existing)
{
+ g_slice_free (CheeseVideoFormatFull, format);
cheese_camera_device_format_update_framerate (existing, framerate);
return;
}
@@ -380,7 +381,7 @@ cheese_camera_device_add_format (CheeseCameraDevice *device,
* Free the individual #CheeseVideoFormatFull.
*/
static void
-free_format_list_foreach (gpointer data, G_GNUC_UNUSED gpointer user_data)
+free_format_list_foreach (gpointer data)
{
g_slice_free (CheeseVideoFormatFull, data);
}
@@ -396,7 +397,7 @@ free_format_list (CheeseCameraDevice *device)
{
CheeseCameraDevicePrivate *priv = device->priv;
- g_list_foreach (priv->formats, free_format_list_foreach, NULL);
+ g_list_free_full (priv->formats, free_format_list_foreach);
priv->formats = NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]