cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix a possible crash as dbus_message_get_path() could return NULL

Browse Source 
noticed while reading the dbus api...don't ask.
This commit is contained in:
jasper 2009-11-12 00:22:55 +00:00
parent e6afe67e17
commit bcdf440ab3
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/session/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.89 2009/10/22 16:47:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.90 2009/11/12 00:22:55 jasper Exp $
COMMENT= GNOME session
GNOME_PROJECT= gnome-session
GNOME_VERSION= 2.28.0
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= x11

22
x11/gnome/session/patches/patch-gnome-session_gsm-dbus-client_c Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-gnome-session_gsm-dbus-client_c,v 1.1 2009/11/12 00:22:55 jasper Exp $
dbus_message_get_path() can return NULL
--- gnome-session/gsm-dbus-client.c.orig Thu Nov 12 01:17:12 2009
+++ gnome-session/gsm-dbus-client.c Thu Nov 12 01:17:51 2009
@@ -213,10 +213,11 @@ client_dbus_filter_function (DBusConnection *connectio
path = dbus_message_get_path (message);
- g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s",
- dbus_message_get_path (message),
- dbus_message_get_interface (message),
- dbus_message_get_member (message));
+ if (path != NULL)
+ g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s",
+ dbus_message_get_path (message),
+ dbus_message_get_interface (message),
+ dbus_message_get_member (message));
if (dbus_message_is_method_call (message, SM_DBUS_CLIENT_PRIVATE_INTERFACE, "EndSessionResponse")) {
g_assert (gsm_client_peek_id (GSM_CLIENT (client)) != NULL);