[Galago-commits] r2966 - in trunk/libnotify: . libnotify
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Thu Feb 15 02:10:33 PST 2007
Author: chipx86
Date: 2007-02-15 02:10:32 -0800 (Thu, 15 Feb 2007)
New Revision: 2966
Modified:
trunk/libnotify/ChangeLog
trunk/libnotify/libnotify/notification.c
Log:
Fix some memory leaks when appending data to a message. Scary, horrible, traumatizing memory leaks. Actually it's pretty bad, though, so new release coming up soon. This fixes bug #112.
Modified: trunk/libnotify/ChangeLog
===================================================================
--- trunk/libnotify/ChangeLog 2007-02-15 09:59:13 UTC (rev 2965)
+++ trunk/libnotify/ChangeLog 2007-02-15 10:10:32 UTC (rev 2966)
@@ -1,3 +1,10 @@
+Thu Feb 15 02:06:11 PST 2007 Christian Hammond <chipx86 at chipx86.com>
+
+ * libnotify/notification.c:
+ - Fix some memory leaks when appending data to a message. Scary,
+ horrible, traumatizing memory leaks. Actually it's pretty bad,
+ though, so new release coming up soon. This fixes bug #112.
+
Thu Feb 15 01:58:52 PST 2007 Christian Hammond <chipx86 at chipx86.com>
* tests/test-image.c:
Modified: trunk/libnotify/libnotify/notification.c
===================================================================
--- trunk/libnotify/libnotify/notification.c 2007-02-15 09:59:13 UTC (rev 2965)
+++ trunk/libnotify/libnotify/notification.c 2007-02-15 10:10:32 UTC (rev 2966)
@@ -856,60 +856,42 @@
}
#if CHECK_DBUS_VERSION(0, 60)
-static gboolean
+static void
_gvalue_array_append_int(GValueArray *array, gint i)
{
- GValue *value = g_new0(GValue, 1);
+ GValue value = {0};
- if (value == NULL)
- return FALSE;
-
- g_value_init(value, G_TYPE_INT);
- g_value_set_int(value, i);
- g_value_array_append(array, value);
-
- return TRUE;
+ g_value_init(&value, G_TYPE_INT);
+ g_value_set_int(&value, i);
+ g_value_array_append(array, &value);
+ g_value_unset(&value);
}
-static gboolean
+static void
_gvalue_array_append_bool(GValueArray *array, gboolean b)
{
- GValue *value = g_new0(GValue, 1);
+ GValue value = {0};
- if (value == NULL)
- return FALSE;
-
- g_value_init(value, G_TYPE_BOOLEAN);
- g_value_set_boolean(value, b);
- g_value_array_append(array, value);
-
- return TRUE;
+ g_value_init(&value, G_TYPE_BOOLEAN);
+ g_value_set_boolean(&value, b);
+ g_value_array_append(array, &value);
+ g_value_unset(&value);
}
-static gboolean
+static void
_gvalue_array_append_byte_array(GValueArray *array, guchar *bytes, gsize len)
{
GArray *byte_array;
- GValue *value;
+ GValue value = {0};
byte_array = g_array_sized_new(FALSE, FALSE, sizeof(guchar), len);
-
- if (byte_array == NULL)
- return FALSE;
-
+ g_assert(byte_array != NULL);
byte_array = g_array_append_vals(byte_array, bytes, len);
- if ((value = g_new0(GValue, 1)) == NULL)
- {
- g_array_free(byte_array, TRUE);
- return FALSE;
- }
-
- g_value_init(value, DBUS_TYPE_G_UCHAR_ARRAY);
- g_value_set_boxed_take_ownership(value, byte_array);
- g_value_array_append(array, value);
-
- return TRUE;
+ g_value_init(&value, DBUS_TYPE_G_UCHAR_ARRAY);
+ g_value_set_boxed_take_ownership(&value, byte_array);
+ g_value_array_append(array, &value);
+ g_value_unset(&value);
}
#endif /* D-BUS >= 0.60 */
More information about the galago-commits
mailing list