styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2017-02-10 17:23:43 -05:00
parent c3dd3cf828
commit 57edf1bbd8
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_config.c
View File

@ -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);

2
src/bin/e_config.h
View File

@ -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

6
src/bin/e_desk.c
View File

@ -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);
}
}

5
src/modules/conf_display/e_int_config_desk.c
View File

@ -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);
}