From 542d9fc9c63dab14081354c889a3d83cb942fc8c Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 6 Jan 2009 16:50:08 +0000 Subject: [PATCH] Assert that sound_id is OK before getting sound_entries[sound_id], to avoid crash. svn path=/trunk/; revision=2103 --- libempathy-gtk/empathy-ui-utils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 5f36b4b7..474148a6 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -1563,10 +1563,12 @@ void 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 @@ empathy_sound_play (GtkWidget *widget, CA_PROP_EVENT_DESCRIPTION, gettext (entry->event_ca_description), NULL); } -} \ No newline at end of file +} -- 2.39.2