Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 21:33:27 +01:00
Code Issues Projects Releases Wiki Activity

fix possible segfaults

Browse Source
This commit is contained in:
Jfreegman 2014-08-27 13:54:02 -04:00
parent 7edcf6cb45
commit b1c7e21ca9
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/settings.c
View File

@ -305,61 +305,61 @@ int settings_load(struct user_settings *s, const char *patharg)
if ((setting = config_lookup(cfg, sound_strings.self)) != NULL) { if ((setting = config_lookup(cfg, sound_strings.self)) != NULL) {
if ( (config_setting_lookup_string(setting, sound_strings.error, &str) != CONFIG_TRUE) || if ( (config_setting_lookup_string(setting, sound_strings.error, &str) != CONFIG_TRUE) ||
!set_sound(error, str) ) { !set_sound(error, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(error, PACKAGE_DATADIR "/sounds/Error.wav"); set_sound(error, PACKAGE_DATADIR "/sounds/Error.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.user_log_in, &str) || if ( !config_setting_lookup_string(setting, sound_strings.user_log_in, &str) ||
!set_sound(user_log_in, str) ) { !set_sound(user_log_in, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ContactLogsIn.wav"); set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ContactLogsIn.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.self_log_in, &str) || if ( !config_setting_lookup_string(setting, sound_strings.self_log_in, &str) ||
!set_sound(self_log_in, str) ) { !set_sound(self_log_in, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(self_log_in, PACKAGE_DATADIR "/sounds/LogIn.wav"); set_sound(self_log_in, PACKAGE_DATADIR "/sounds/LogIn.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.user_log_out, &str) || if ( !config_setting_lookup_string(setting, sound_strings.user_log_out, &str) ||
!set_sound(user_log_out, str) ) { !set_sound(user_log_out, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ContactLogsOut.wav"); set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ContactLogsOut.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.self_log_out, &str) || if ( !config_setting_lookup_string(setting, sound_strings.self_log_out, &str) ||
!set_sound(self_log_out, str) ) { !set_sound(self_log_out, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(self_log_out, PACKAGE_DATADIR "/sounds/LogOut.wav"); set_sound(self_log_out, PACKAGE_DATADIR "/sounds/LogOut.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.call_incoming, &str) || if ( !config_setting_lookup_string(setting, sound_strings.call_incoming, &str) ||
!set_sound(call_incoming, str) ) { !set_sound(call_incoming, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav"); set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.call_outgoing, &str) || if ( !config_setting_lookup_string(setting, sound_strings.call_outgoing, &str) ||
!set_sound(call_outgoing, str) ) { !set_sound(call_outgoing, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav"); set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.generic_message, &str) || if ( !config_setting_lookup_string(setting, sound_strings.generic_message, &str) ||
!set_sound(generic_message, str) ) { !set_sound(generic_message, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(generic_message, PACKAGE_DATADIR "/sounds/NewMessage.wav"); set_sound(generic_message, PACKAGE_DATADIR "/sounds/NewMessage.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.transfer_pending, &str) || if ( !config_setting_lookup_string(setting, sound_strings.transfer_pending, &str) ||
!set_sound(transfer_pending, str) ) { !set_sound(transfer_pending, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/TransferPending.wav"); set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/TransferPending.wav");
} }
if ( !config_setting_lookup_string(setting, sound_strings.transfer_completed, &str) || if ( !config_setting_lookup_string(setting, sound_strings.transfer_completed, &str) ||
!set_sound(transfer_completed, str) ) { !set_sound(transfer_completed, str) ) {
if (strcasecmp(str, NO_SOUND) != 0) if (str && strcasecmp(str, NO_SOUND) != 0)
set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/TransferComplete.wav"); set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/TransferComplete.wav");
} }
} }