From a196720a1571700ae01b6840462b47f9f07dd773 Mon Sep 17 00:00:00 2001 From: Jan Arne Petersen Date: Wed, 10 Jan 2007 17:33:07 +0000 Subject: [PATCH] Fixes #395083 2007-01-10 Jan Arne Petersen Fixes #395083 * actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_open): added missing NULL-check. svn path=/trunk/; revision=7128 --- gnome-settings-daemon/ChangeLog | 7 +++++++ gnome-settings-daemon/actions/acme-volume-gstreamer.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 9638c4ae7..42053e68b 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,10 @@ +2007-01-10 Jan Arne Petersen + + Fixes #395083 + + * actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_open): added + missing NULL-check. + 2007-01-08 Jan Arne Petersen Fixes #173035 diff --git a/gnome-settings-daemon/actions/acme-volume-gstreamer.c b/gnome-settings-daemon/actions/acme-volume-gstreamer.c index 4401a3fda..476ee35c2 100644 --- a/gnome-settings-daemon/actions/acme-volume-gstreamer.c +++ b/gnome-settings-daemon/actions/acme-volume-gstreamer.c @@ -270,7 +270,7 @@ static gboolean acme_volume_gstreamer_open (AcmeVolumeGStreamer *vol) { AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol; - gchar *mixer_device, **factory_and_device; + gchar *mixer_device, **factory_and_device = NULL; GList *mixer_list; if (self->_priv == NULL) @@ -284,7 +284,10 @@ acme_volume_gstreamer_open (AcmeVolumeGStreamer *vol) } mixer_device = gconf_client_get_string (self->_priv->gconf_client, DEFAULT_MIXER_DEVICE_KEY, NULL); - factory_and_device = g_strsplit (mixer_device, ":", 2); + if (mixer_device != NULL) + { + factory_and_device = g_strsplit (mixer_device, ":", 2); + } if (factory_and_device != NULL && factory_and_device[0] != NULL) {