From 57edf1bbd8157bfc11924d0a2c3c6bac789dfe3b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 10 Feb 2017 17:23:43 -0500 Subject: [PATCH] remove E_Config->desktop_default_name this is an easy format string attack vector which serves no purpose that I can fathom. the commit log where it was added it also made no mention of this, as it was done in a seemingly-unrelated feature addition --- src/bin/e_config.c | 2 -- src/bin/e_config.h | 2 +- src/bin/e_desk.c | 6 ++---- src/modules/conf_display/e_int_config_desk.c | 5 ++--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index df737c84e..8abb1ed51 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -470,7 +470,6 @@ _e_config_edd_init(Eina_Bool old) E_CONFIG_VAL(D, T, config_type, UINT); /**/ E_CONFIG_VAL(D, T, show_splash, INT); /**/ E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/ - E_CONFIG_VAL(D, T, desktop_default_name, STR); /**/ E_CONFIG_LIST(D, T, desktop_backgrounds, _e_config_desktop_bg_edd); /**/ E_CONFIG_LIST(D, T, desktop_names, _e_config_desktop_name_edd); /**/ E_CONFIG_VAL(D, T, menus_scroll_speed, DOUBLE); /**/ @@ -2420,7 +2419,6 @@ _e_config_free(E_Config *ecf) E_FREE(cc); } if (ecf->desktop_default_background) eina_stringshare_del(ecf->desktop_default_background); - if (ecf->desktop_default_name) eina_stringshare_del(ecf->desktop_default_name); if (ecf->language) eina_stringshare_del(ecf->language); eina_stringshare_del(ecf->desklock_language); eina_stringshare_del(ecf->xkb.selected_layout); diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 0a2dd81ac..00eb90d62 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -58,7 +58,7 @@ struct _E_Config int show_splash; // GUI const char *desktop_default_background; // GUI Eina_List *desktop_backgrounds; // GUI - const char *desktop_default_name; + const char *desktop_default_name; // DEAD Eina_List *desktop_names; // GUI double menus_scroll_speed; // GUI double menus_fast_mouse_move_threshhold; // GUI diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index 3a956834c..83f746e66 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -119,7 +119,7 @@ e_desk_new(E_Zone *zone, int x, int y) if (!ok) { - snprintf(name, sizeof(name), "%s: %d,%d", _(e_config->desktop_default_name), x, y); + snprintf(name, sizeof(name), "%d,%d", x, y); desk->name = eina_stringshare_add(name); } @@ -232,9 +232,7 @@ e_desk_name_update(void) if (!ok) { - snprintf(name, sizeof(name), "%s: %d,%d", - _(e_config->desktop_default_name), - d_x, d_y); + snprintf(name, sizeof(name), "%d,%d", d_x, d_y); e_desk_name_set(desk, name); } } diff --git a/src/modules/conf_display/e_int_config_desk.c b/src/modules/conf_display/e_int_config_desk.c index 832959b52..274ac9b62 100644 --- a/src/modules/conf_display/e_int_config_desk.c +++ b/src/modules/conf_display/e_int_config_desk.c @@ -77,7 +77,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } if (!ok) { - snprintf(name, sizeof(name), "%s: %d,%d", _(e_config->desktop_default_name), cfdata->desk_x, cfdata->desk_y); + snprintf(name, sizeof(name), "%d,%d", cfdata->desk_x, cfdata->desk_y); cfdata->name = strdup(name); } } @@ -110,8 +110,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) if ((!cfdata->name) || (!cfdata->name[0])) { - snprintf(name, sizeof(name), "%s: %d,%d", _(e_config->desktop_default_name), - cfdata->desk_x, cfdata->desk_y); + snprintf(name, sizeof(name), "%d,%d", cfdata->desk_x, cfdata->desk_y); free(cfdata->name); cfdata->name = strdup(name); }