Hello community, here is the log from the commit of package gconf2 for openSUSE:Factory checked in at 2012-03-01 07:24:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gconf2 (Old) and /work/SRC/openSUSE:Factory/.gconf2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gconf2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gconf2/gconf2.changes 2012-02-16 16:13:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gconf2.new/gconf2.changes 2012-03-01 07:24:48.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 27 15:55:27 UTC 2012 - [email protected] + +- Add gconf2-fix-crash-sync-shutdown.patch: fix crash during + syncing is done if gconfd is shutting down (bgo#670033). + +------------------------------------------------------------------- New: ---- gconf2-fix-crash-sync-shutdown.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2.spec ++++++ --- /var/tmp/diff_new_pack.CFOjgD/_old 2012-03-01 07:24:50.000000000 +0100 +++ /var/tmp/diff_new_pack.CFOjgD/_new 2012-03-01 07:24:50.000000000 +0100 @@ -47,6 +47,8 @@ Patch4: gconf2-sabayon.patch # PATCH-FIX-OPENSUSE gconf2-pk-default-path.patch [email protected] -- Use the right gconf path for the defaults in the pk helper Patch5: gconf2-pk-default-path.patch +# PATCH-FIX-UPSTREAM gconf2-fix-crash-sync-dbus.patch bgo#670033 [email protected] -- Fix crash during sync if gconfd is shutting down +Patch6: gconf2-fix-crash-sync-shutdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang = %{version} @@ -109,6 +111,7 @@ %patch3 %patch4 %patch5 -p1 +%patch6 -p1 cp -a %{S:1} %{S:2} . %build ++++++ gconf2-fix-crash-sync-shutdown.patch ++++++ >From 6f3e127330cb0820a373be77be3cb2cacd0b352e Mon Sep 17 00:00:00 2001 From: Ray Strode <[email protected]> Date: Mon, 13 Feb 2012 23:35:06 -0500 Subject: [PATCH] gconf-dbus: don't crash during sync if gconfd shutting down The gconfd shuts down after a bit of inactivity. When that happens there's a window where it refuses requests from the client library with an error. The library is resposible for gracefully handling this condition and reacting appropriately. There are many places in the code where the client library has this idiom: db = gconf_engine_get_database (conf, TRUE, err); if (db == NULL) { g_return_if_fail(err == NULL || *err != NULL); return; } In the event gconfd is shutting down, db will be NULL, and the code will return early from whatever (non-critical) operation it was doing. gconf_engine_suggest_sync has a similiar chunk of code, but it neglected the "return;" and then promptly crashed since it wasn't expecting db to be NULL. This commit adds the return; https://bugzilla.gnome.org/show_bug.cgi?id=670033 --- gconf/gconf-dbus.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c index 9f92125..442a94b 100644 --- a/gconf/gconf-dbus.c +++ b/gconf/gconf-dbus.c @@ -2029,6 +2029,7 @@ gconf_engine_suggest_sync(GConfEngine* conf, GError** err) if (db == NULL) { g_return_if_fail (err == NULL || *err != NULL); + return; } message = dbus_message_new_method_call (GCONF_DBUS_SERVICE, -- 1.7.7 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
