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

[Ted Gould]

Protection. Use it always.

[lp:~dbusmenu-team/libdbusmenu/ubuntu]

159. By Ken VanDine on 2011-09-29

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

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-20 05:02:09 +0000
+++ ChangeLog	2011-09-29 19:52:24 +0000
@@ -1,5 +1,53 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.5.0
+
[phone]  Ted Gould  <[e-mail]>
+
+	More NULL protection
+
[phone]  Ted Gould  <[e-mail]>
+
+	Protecting against NULL private areas
+
[phone]  Ted Gould  <[e-mail]>
+
+	Protect from a NULL class
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ensure the class is correct
+
[phone]  Ted Gould  <[e-mail]>
+
+	Protect client_about_to_show() from abusers
+
[phone]  Ted Gould  <[e-mail]>
+
+	Attaching bug
+
[phone]  Ted Gould  <[e-mail]>
+
+	Protect an external function better
+
[phone]  Ted Gould  <[e-mail]>
+
+	Protect from NULL privates
+
[phone]  Ted Gould  <[e-mail]>
+
+	Protect against an odd crash.  Not sure how the private becomes 'NULL'
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fix ref leaks in proxy code
+
[phone]  Michael Terry  <[e-mail]>
+
+	unref added children in proxy code
+
 2011-09-19  Ted Gould  <[e-mail]>
 
 	0.4.94

=== modified file 'configure'
--- configure	2011-09-20 05:03:25 +0000
+++ configure	2011-09-29 19:52:24 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libdbusmenu 0.4.94.
+# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.0.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -572,8 +572,8 @@
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.4.94'
-PACKAGE_STRING='libdbusmenu 0.4.94'
+PACKAGE_VERSION='0.5.0'
+PACKAGE_STRING='libdbusmenu 0.5.0'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1429,7 +1429,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libdbusmenu 0.4.94 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1499,7 +1499,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdbusmenu 0.4.94:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.5.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1649,7 +1649,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdbusmenu configure 0.4.94
+libdbusmenu configure 0.5.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2020,7 +2020,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libdbusmenu $as_me 0.4.94, which was
+It was created by libdbusmenu $as_me 0.5.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2841,7 +2841,7 @@
 
 # Define the identity of the package.
  PACKAGE=libdbusmenu
- VERSION=0.4.94
+ VERSION=0.5.0
 
 
 # Some tools Automake needs.
@@ -14309,7 +14309,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=4
-LIBDBUSMENU_REVISION=4
+LIBDBUSMENU_REVISION=5
 LIBDBUSMENU_AGE=0
 
 
@@ -15659,7 +15659,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libdbusmenu $as_me 0.4.94, which was
+This file was extended by libdbusmenu $as_me 0.5.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15725,7 +15725,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libdbusmenu config.status 0.4.94
+libdbusmenu config.status 0.5.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== 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 @@
 
-AC_INIT(libdbusmenu, 0.4.94, [e-mail])
+AC_INIT(libdbusmenu, 0.5.0, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.4.94, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.5.0, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -172,7 +172,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=4
-LIBDBUSMENU_REVISION=4
+LIBDBUSMENU_REVISION=5
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)

=== 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 @@
+libdbusmenu (0.5.0-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    * Protect functions against NULL results (LP: #757569, LP: #742909,
+      LP: #743050, LP: #743661)
+
+ -- Ted Gould <[e-mail]>  Thu, 29 Sep 2011 14:46:57 -0500
+
 libdbusmenu (0.4.94-0ubuntu1) oneiric; urgency=low
 
   [ Ted Gould ]

=== 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 @@
-0.4.94
+0.5.0

=== 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 @@
-0.4.94
+0.5.0

=== 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 @@
 
 	/* If this wasn't cancelled, we should be good */
 	DbusmenuClient * client = DBUSMENU_CLIENT(user_data);
+	/* But let's check */
+	g_return_if_fail(client != NULL);
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+	g_return_if_fail(priv != NULL);
+
+
 	priv->menuproxy = proxy;
 
 	if (priv->menuproxy_cancel != NULL) {
@@ -1604,7 +1609,11 @@
 void
 dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(gpointer data), gpointer cb_data)
 {
+	g_return_if_fail(DBUSMENU_CLIENT(client));
+	g_return_if_fail(id > 0);
+
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+	g_return_if_fail(priv != NULL);
 
 	about_to_show_t * data = g_new0(about_to_show_t, 1);
 	data->client = client;

=== 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 @@
 	DbusmenuMenuitemProxy * pmi = DBUSMENU_MENUITEM_PROXY(user_data);
 	DbusmenuMenuitemProxy * child_pmi = dbusmenu_menuitem_proxy_new(child);
 	dbusmenu_menuitem_child_add_position(DBUSMENU_MENUITEM(pmi), DBUSMENU_MENUITEM(child_pmi), position);
+	g_object_unref (child_pmi);
 	return;
 }
 
@@ -283,6 +284,7 @@
 	for (child = children; child != NULL; child = g_list_next(child)) {
 		DbusmenuMenuitemProxy * child_pmi = dbusmenu_menuitem_proxy_new(DBUSMENU_MENUITEM(child->data));
 		dbusmenu_menuitem_child_append(DBUSMENU_MENUITEM(pmi), DBUSMENU_MENUITEM(child_pmi));
+		g_object_unref (child_pmi);
 	}
 
 	return;

=== 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 @@
 	#endif
 	DbusmenuMenuitemClass * class = DBUSMENU_MENUITEM_GET_CLASS(mi);
 
-	if (class->send_about_to_show != NULL) {
+	if (class != NULL && class->send_about_to_show != NULL) {
 		return class->send_about_to_show(mi, cb, cb_data);
 	} else if (cb != NULL) {
 		cb(mi, cb_data);

=== 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 @@
 static void
 bus_get_layout (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)
 {
+	g_return_if_fail(DBUSMENU_IS_SERVER(server));
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+	g_return_if_fail(priv != NULL);
 
 	/* Input */
 	gint32 parent;