empathy r2103 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Jan  6 16:50:08 2009
New Revision: 2103
URL: http://svn.gnome.org/viewvc/empathy?rev=2103&view=rev

Log:
Assert that sound_id is OK before getting sound_entries[sound_id], to avoid crash.

Modified:
   trunk/libempathy-gtk/empathy-ui-utils.c

Modified: trunk/libempathy-gtk/empathy-ui-utils.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ui-utils.c	(original)
+++ trunk/libempathy-gtk/empathy-ui-utils.c	Tue Jan  6 16:50:08 2009
@@ -1563,10 +1563,12 @@
 empathy_sound_play (GtkWidget *widget,
 		    EmpathySound sound_id)
 {
-	EmpathySoundEntry *entry = &(sound_entries[sound_id]);
+	EmpathySoundEntry *entry;
 	gboolean should_play = TRUE;
 
-	g_return_if_fail (entry->sound_id < LAST_EMPATHY_SOUND);
+	g_return_if_fail (sound_id < LAST_EMPATHY_SOUND);
+
+	entry = &(sound_entries[sound_id]);
 	g_return_if_fail (entry->sound_id == sound_id);
 
 	if (entry->gconf_key != NULL) {
@@ -1583,4 +1585,4 @@
 					CA_PROP_EVENT_DESCRIPTION, gettext (entry->event_ca_description),
 					NULL);
 	}
-}
\ No newline at end of file
+}