DBus Menu

Merge lp:~dbusmenu-team/libdbusmenu/ubuntu into lp:~ubuntu-desktop/libdbusmenu/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 159
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 285 lines (+86/-17)
10 files modified
ChangeLog (+48/-0)
configure (+11/-11)
configure.ac (+3/-3)
debian/changelog (+8/-0)
docs/libdbusmenu-glib/reference/version.xml (+1/-1)
docs/libdbusmenu-gtk/reference/version.xml (+1/-1)
libdbusmenu-glib/client.c (+9/-0)
libdbusmenu-glib/menuitem-proxy.c (+2/-0)
libdbusmenu-glib/menuitem.c (+1/-1)
libdbusmenu-glib/server.c (+2/-0)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+77598@code.launchpad.net

Description of the change

Protection. Use it always.

To post a comment you must log in.
lp:~dbusmenu-team/libdbusmenu/ubuntu updated
159. By Ken VanDine

* New upstream release.
  * Protect functions against NULL results (LP: #757569, LP: #742909,
    LP: #743050, LP: #743661)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-09-20 05:02:09 +0000
+++ ChangeLog 2011-09-29 19:52:24 +0000
@@ -1,5 +1,53 @@
1# Generated by Makefile. Do not edit.1# Generated by Makefile. Do not edit.
22
32011-09-29 Ted Gould <ted@gould.cx>
4
5 0.5.0
6
72011-09-29 Ted Gould <ted@gould.cx>
8
9 More NULL protection
10
112011-09-23 Ted Gould <ted@gould.cx>
12
13 Protecting against NULL private areas
14
152011-09-27 Ted Gould <ted@gould.cx>
16
17 Protect from a NULL class
18
192011-09-23 Ted Gould <ted@gould.cx>
20
21 Ensure the class is correct
22
232011-09-27 Ted Gould <ted@gould.cx>
24
25 Protect client_about_to_show() from abusers
26
272011-09-23 Ted Gould <ted@gould.cx>
28
29 Attaching bug
30
312011-09-23 Ted Gould <ted@gould.cx>
32
33 Protect an external function better
34
352011-09-27 Ted Gould <ted@gould.cx>
36
37 Protect from NULL privates
38
392011-09-23 Ted Gould <ted@gould.cx>
40
41 Protect against an odd crash. Not sure how the private becomes 'NULL'
42
432011-09-23 Ted Gould <ted@gould.cx>
44
45 Fix ref leaks in proxy code
46
472011-09-23 Michael Terry <michael.terry@canonical.com>
48
49 unref added children in proxy code
50
32011-09-19 Ted Gould <ted@gould.cx>512011-09-19 Ted Gould <ted@gould.cx>
452
5 0.4.9453 0.4.94
654
=== modified file 'configure'
--- configure 2011-09-20 05:03:25 +0000
+++ configure 2011-09-29 19:52:24 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.68 for libdbusmenu 0.4.94.3# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.0.
4#4#
5# Report bugs to <ted@canonical.com>.5# Report bugs to <ted@canonical.com>.
6#6#
@@ -572,8 +572,8 @@
572# Identity of this package.572# Identity of this package.
573PACKAGE_NAME='libdbusmenu'573PACKAGE_NAME='libdbusmenu'
574PACKAGE_TARNAME='libdbusmenu'574PACKAGE_TARNAME='libdbusmenu'
575PACKAGE_VERSION='0.4.94'575PACKAGE_VERSION='0.5.0'
576PACKAGE_STRING='libdbusmenu 0.4.94'576PACKAGE_STRING='libdbusmenu 0.5.0'
577PACKAGE_BUGREPORT='ted@canonical.com'577PACKAGE_BUGREPORT='ted@canonical.com'
578PACKAGE_URL=''578PACKAGE_URL=''
579579
@@ -1429,7 +1429,7 @@
1429 # Omit some internal or obsolete options to make the list less imposing.1429 # Omit some internal or obsolete options to make the list less imposing.
1430 # This message is too long to be a string in the A/UX 3.1 sh.1430 # This message is too long to be a string in the A/UX 3.1 sh.
1431 cat <<_ACEOF1431 cat <<_ACEOF
1432\`configure' configures libdbusmenu 0.4.94 to adapt to many kinds of systems.1432\`configure' configures libdbusmenu 0.5.0 to adapt to many kinds of systems.
14331433
1434Usage: $0 [OPTION]... [VAR=VALUE]...1434Usage: $0 [OPTION]... [VAR=VALUE]...
14351435
@@ -1499,7 +1499,7 @@
14991499
1500if test -n "$ac_init_help"; then1500if test -n "$ac_init_help"; then
1501 case $ac_init_help in1501 case $ac_init_help in
1502 short | recursive ) echo "Configuration of libdbusmenu 0.4.94:";;1502 short | recursive ) echo "Configuration of libdbusmenu 0.5.0:";;
1503 esac1503 esac
1504 cat <<\_ACEOF1504 cat <<\_ACEOF
15051505
@@ -1649,7 +1649,7 @@
1649test -n "$ac_init_help" && exit $ac_status1649test -n "$ac_init_help" && exit $ac_status
1650if $ac_init_version; then1650if $ac_init_version; then
1651 cat <<\_ACEOF1651 cat <<\_ACEOF
1652libdbusmenu configure 0.4.941652libdbusmenu configure 0.5.0
1653generated by GNU Autoconf 2.681653generated by GNU Autoconf 2.68
16541654
1655Copyright (C) 2010 Free Software Foundation, Inc.1655Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2020,7 +2020,7 @@
2020This file contains any messages produced by compilers while2020This file contains any messages produced by compilers while
2021running configure, to aid debugging if configure makes a mistake.2021running configure, to aid debugging if configure makes a mistake.
20222022
2023It was created by libdbusmenu $as_me 0.4.94, which was2023It was created by libdbusmenu $as_me 0.5.0, which was
2024generated by GNU Autoconf 2.68. Invocation command line was2024generated by GNU Autoconf 2.68. Invocation command line was
20252025
2026 $ $0 $@2026 $ $0 $@
@@ -2841,7 +2841,7 @@
28412841
2842# Define the identity of the package.2842# Define the identity of the package.
2843 PACKAGE=libdbusmenu2843 PACKAGE=libdbusmenu
2844 VERSION=0.4.942844 VERSION=0.5.0
28452845
28462846
2847# Some tools Automake needs.2847# Some tools Automake needs.
@@ -14309,7 +14309,7 @@
14309###########################14309###########################
1431014310
14311LIBDBUSMENU_CURRENT=414311LIBDBUSMENU_CURRENT=4
14312LIBDBUSMENU_REVISION=414312LIBDBUSMENU_REVISION=5
14313LIBDBUSMENU_AGE=014313LIBDBUSMENU_AGE=0
1431414314
1431514315
@@ -15659,7 +15659,7 @@
15659# report actual input values of CONFIG_FILES etc. instead of their15659# report actual input values of CONFIG_FILES etc. instead of their
15660# values after options handling.15660# values after options handling.
15661ac_log="15661ac_log="
15662This file was extended by libdbusmenu $as_me 0.4.94, which was15662This file was extended by libdbusmenu $as_me 0.5.0, which was
15663generated by GNU Autoconf 2.68. Invocation command line was15663generated by GNU Autoconf 2.68. Invocation command line was
1566415664
15665 CONFIG_FILES = $CONFIG_FILES15665 CONFIG_FILES = $CONFIG_FILES
@@ -15725,7 +15725,7 @@
15725cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=115725cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15726ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"15726ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15727ac_cs_version="\\15727ac_cs_version="\\
15728libdbusmenu config.status 0.4.9415728libdbusmenu config.status 0.5.0
15729configured by $0, generated by GNU Autoconf 2.68,15729configured by $0, generated by GNU Autoconf 2.68,
15730 with options \\"\$ac_cs_config\\"15730 with options \\"\$ac_cs_config\\"
1573115731
1573215732
=== modified file 'configure.ac'
--- configure.ac 2011-09-20 05:03:25 +0000
+++ configure.ac 2011-09-29 19:52:24 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.4.94, ted@canonical.com)2AC_INIT(libdbusmenu, 0.5.0, ted@canonical.com)
3AC_COPYRIGHT([Copyright 2009,2010 Canonical])3AC_COPYRIGHT([Copyright 2009,2010 Canonical])
44
5AC_PREREQ(2.62)5AC_PREREQ(2.62)
66
7AM_CONFIG_HEADER(config.h)7AM_CONFIG_HEADER(config.h)
8AM_INIT_AUTOMAKE(libdbusmenu, 0.4.94, [-Wno-portability])8AM_INIT_AUTOMAKE(libdbusmenu, 0.5.0, [-Wno-portability])
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -172,7 +172,7 @@
172###########################172###########################
173173
174LIBDBUSMENU_CURRENT=4174LIBDBUSMENU_CURRENT=4
175LIBDBUSMENU_REVISION=4175LIBDBUSMENU_REVISION=5
176LIBDBUSMENU_AGE=0176LIBDBUSMENU_AGE=0
177177
178AC_SUBST(LIBDBUSMENU_CURRENT)178AC_SUBST(LIBDBUSMENU_CURRENT)
179179
=== modified file 'debian/changelog'
--- debian/changelog 2011-09-20 16:41:41 +0000
+++ debian/changelog 2011-09-29 19:52:24 +0000
@@ -1,3 +1,11 @@
1libdbusmenu (0.5.0-0ubuntu1~ppa1) oneiric; urgency=low
2
3 * New upstream release.
4 * Protect functions against NULL results (LP: #757569, LP: #742909,
5 LP: #743050, LP: #743661)
6
7 -- Ted Gould <ted@ubuntu.com> Thu, 29 Sep 2011 14:46:57 -0500
8
1libdbusmenu (0.4.94-0ubuntu1) oneiric; urgency=low9libdbusmenu (0.4.94-0ubuntu1) oneiric; urgency=low
210
3 [ Ted Gould ]11 [ Ted Gould ]
412
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml 2011-09-20 05:03:25 +0000
+++ docs/libdbusmenu-glib/reference/version.xml 2011-09-29 19:52:24 +0000
@@ -1,1 +1,1 @@
10.4.9410.5.0
22
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml 2011-09-20 05:03:25 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml 2011-09-29 19:52:24 +0000
@@ -1,1 +1,1 @@
10.4.9410.5.0
22
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c 2011-04-19 19:49:33 +0000
+++ libdbusmenu-glib/client.c 2011-09-29 19:52:24 +0000
@@ -1057,7 +1057,12 @@
10571057
1058 /* If this wasn't cancelled, we should be good */1058 /* If this wasn't cancelled, we should be good */
1059 DbusmenuClient * client = DBUSMENU_CLIENT(user_data);1059 DbusmenuClient * client = DBUSMENU_CLIENT(user_data);
1060 /* But let's check */
1061 g_return_if_fail(client != NULL);
1060 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);1062 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
1063 g_return_if_fail(priv != NULL);
1064
1065
1061 priv->menuproxy = proxy;1066 priv->menuproxy = proxy;
10621067
1063 if (priv->menuproxy_cancel != NULL) {1068 if (priv->menuproxy_cancel != NULL) {
@@ -1604,7 +1609,11 @@
1604void1609void
1605dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(gpointer data), gpointer cb_data)1610dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(gpointer data), gpointer cb_data)
1606{1611{
1612 g_return_if_fail(DBUSMENU_CLIENT(client));
1613 g_return_if_fail(id > 0);
1614
1607 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);1615 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
1616 g_return_if_fail(priv != NULL);
16081617
1609 about_to_show_t * data = g_new0(about_to_show_t, 1);1618 about_to_show_t * data = g_new0(about_to_show_t, 1);
1610 data->client = client;1619 data->client = client;
16111620
=== modified file 'libdbusmenu-glib/menuitem-proxy.c'
--- libdbusmenu-glib/menuitem-proxy.c 2011-02-16 19:34:17 +0000
+++ libdbusmenu-glib/menuitem-proxy.c 2011-09-29 19:52:24 +0000
@@ -188,6 +188,7 @@
188 DbusmenuMenuitemProxy * pmi = DBUSMENU_MENUITEM_PROXY(user_data);188 DbusmenuMenuitemProxy * pmi = DBUSMENU_MENUITEM_PROXY(user_data);
189 DbusmenuMenuitemProxy * child_pmi = dbusmenu_menuitem_proxy_new(child);189 DbusmenuMenuitemProxy * child_pmi = dbusmenu_menuitem_proxy_new(child);
190 dbusmenu_menuitem_child_add_position(DBUSMENU_MENUITEM(pmi), DBUSMENU_MENUITEM(child_pmi), position);190 dbusmenu_menuitem_child_add_position(DBUSMENU_MENUITEM(pmi), DBUSMENU_MENUITEM(child_pmi), position);
191 g_object_unref (child_pmi);
191 return;192 return;
192}193}
193194
@@ -283,6 +284,7 @@
283 for (child = children; child != NULL; child = g_list_next(child)) {284 for (child = children; child != NULL; child = g_list_next(child)) {
284 DbusmenuMenuitemProxy * child_pmi = dbusmenu_menuitem_proxy_new(DBUSMENU_MENUITEM(child->data));285 DbusmenuMenuitemProxy * child_pmi = dbusmenu_menuitem_proxy_new(DBUSMENU_MENUITEM(child->data));
285 dbusmenu_menuitem_child_append(DBUSMENU_MENUITEM(pmi), DBUSMENU_MENUITEM(child_pmi));286 dbusmenu_menuitem_child_append(DBUSMENU_MENUITEM(pmi), DBUSMENU_MENUITEM(child_pmi));
287 g_object_unref (child_pmi);
286 }288 }
287289
288 return;290 return;
289291
=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c 2011-06-20 21:43:41 +0000
+++ libdbusmenu-glib/menuitem.c 2011-09-29 19:52:24 +0000
@@ -1730,7 +1730,7 @@
1730 #endif1730 #endif
1731 DbusmenuMenuitemClass * class = DBUSMENU_MENUITEM_GET_CLASS(mi);1731 DbusmenuMenuitemClass * class = DBUSMENU_MENUITEM_GET_CLASS(mi);
17321732
1733 if (class->send_about_to_show != NULL) {1733 if (class != NULL && class->send_about_to_show != NULL) {
1734 return class->send_about_to_show(mi, cb, cb_data);1734 return class->send_about_to_show(mi, cb, cb_data);
1735 } else if (cb != NULL) {1735 } else if (cb != NULL) {
1736 cb(mi, cb_data);1736 cb(mi, cb_data);
17371737
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c 2011-08-24 21:13:32 +0000
+++ libdbusmenu-glib/server.c 2011-09-29 19:52:24 +0000
@@ -1194,7 +1194,9 @@
1194static void1194static void
1195bus_get_layout (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)1195bus_get_layout (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)
1196{1196{
1197 g_return_if_fail(DBUSMENU_IS_SERVER(server));
1197 DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);1198 DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
1199 g_return_if_fail(priv != NULL);
11981200
1199 /* Input */1201 /* Input */
1200 gint32 parent;1202 gint32 parent;

Subscribers

People subscribed via source and target branches

to all changes: