applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #395083

Browse source 
2007-01-10  Jan Arne Petersen  <jpetersen@jpetersen.org>

	Fixes #395083

	* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_open): added
	missing NULL-check.


svn path=/trunk/; revision=7128
This commit is contained in:
Jan Arne Petersen 2007-01-10 17:33:07 +00:00 • committed by Jan Arne Petersen
parent 533b2fb9e5
commit a196720a15
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,10 @@
2007-01-10 Jan Arne Petersen <jpetersen@jpetersen.org>
Fixes #395083
* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_open): added
missing NULL-check.
2007-01-08 Jan Arne Petersen <jpetersen@jpetersen.org> 2007-01-08 Jan Arne Petersen <jpetersen@jpetersen.org>
Fixes #173035 Fixes #173035

7
gnome-settings-daemon/actions/acme-volume-gstreamer.c
View file

@ -270,7 +270,7 @@ static gboolean
acme_volume_gstreamer_open (AcmeVolumeGStreamer *vol) acme_volume_gstreamer_open (AcmeVolumeGStreamer *vol)
{ {
AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol; AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
gchar *mixer_device, **factory_and_device; gchar *mixer_device, **factory_and_device = NULL;
GList *mixer_list; GList *mixer_list;
if (self->_priv == NULL) 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); 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) if (factory_and_device != NULL && factory_and_device[0] != NULL)
{ {