From 7c48e370ec2b9c3437a77e81b535b1f20672f817 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Jul 2010 09:02:15 -0500 Subject: Adding protections on dbusmenu_client_send_event() --- libdbusmenu-glib/client.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 871170a..2e985d6 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -716,6 +716,17 @@ menuitem_call_cb (DBusGProxy * proxy, GError * error, gpointer userdata) void dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, const GValue * value, guint timestamp) { + g_return_if_fail(DBUSMENU_IS_CLIENT(client)); + g_return_if_fail(id >= 0); + g_return_if_fail(name != NULL); + + if (value == NULL) { + GValue internalval = {0}; + g_value_init(&internalval, G_TYPE_INT); + g_value_set_int(&internalval, 0); + value = &internalval; + } + DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); org_ayatana_dbusmenu_event_async (priv->menuproxy, id, name, value, timestamp, menuitem_call_cb, GINT_TO_POINTER(id)); return; -- cgit v1.2.3 From 98b3815a25ffcf89f7d5b062bda254f5fcaa1ab2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Jul 2010 09:35:16 -0500 Subject: 0.3.6 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7ec994b..6c2400c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.3.5, ted@canonical.com) +AC_INIT(libdbusmenu, 0.3.6, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.3.5, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.3.6, [-Wno-portability]) AM_MAINTAINER_MODE @@ -87,7 +87,7 @@ AC_PATH_PROG([VALA_API_GEN], [vapigen]) ########################### LIBDBUSMENU_CURRENT=1 -LIBDBUSMENU_REVISION=10 +LIBDBUSMENU_REVISION=11 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) -- cgit v1.2.3 From e64fccb7a2a74a310ccc1a11490e0a8a0a871b2a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Jul 2010 09:42:10 -0500 Subject: releasing version 0.3.6-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0c584c1..a5a18c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.3.6-0ubuntu1~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.3.6-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. ∘ Protect against NULL values as event - -- Ted Gould Thu, 15 Jul 2010 09:38:38 -0500 + -- Ted Gould Thu, 15 Jul 2010 09:42:07 -0500 libdbusmenu (0.3.5-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3