From 5e4929a1cf888531bcfadad8a0397c9ab4082076 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 28 Jan 2009 21:13:34 +0000 Subject: [PATCH] Fix NULL dereference by clang (thanks to Luis Felipe). SVN revision: 38834 --- src/modules/conf_mousebindings/e_int_config_mousebindings.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c index bbf1b5995..006c8ecbc 100644 --- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c +++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c @@ -765,8 +765,10 @@ _update_mouse_binding_list(E_Config_Dialog_Data *cfdata) button = _helper_button_name_get(eb); mods = _helper_modifier_name_get(eb->modifiers); - snprintf(label, sizeof(label), "%s%s%s", button ? button : "", mods[0] ? " + ": "", - mods ? mods : ""); + if (mods && mods[0]) + snprintf(label, sizeof(label), "%s + %s", button ? button : "", mods); + else + snprintf(label, sizeof(label), "%s", button ? button : ""); if (button) free(button); if (mods) free(mods);