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

lets not segfault by trying to print into a variable too much info. 

We've allocated 10 chars, not 11, so let's snprint the correct length.

Thanks to cippp for the error report ;)

Fix up some formatting and remove some whitespace also.



SVN revision: 53245
This commit is contained in:
Christopher Michael 2010-10-10 23:36:26 +00:00
parent 058f651795
commit 0ac0da81a5
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/bin/e_widget_csel.c
View File

@ -17,15 +17,14 @@ static void
_e_wid_del_hook(Evas_Object *obj) _e_wid_del_hook(Evas_Object *obj)
{ {
E_Widget_Data *wd; E_Widget_Data *wd;
int i; int i = 0;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (!wd) return; if (!wd) return;
for (i = 0; i < E_COLOR_COMPONENT_MAX; i++) for (i = 0; i < E_COLOR_COMPONENT_MAX; i++)
{ E_FREE(wd->values[i]);
E_FREE(wd->values[i]);
}
E_FREE(wd->values); E_FREE(wd->values);
eina_list_free(wd->sliders); eina_list_free(wd->sliders);
@ -49,15 +48,13 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
E_Widget_Data *wd = data; E_Widget_Data *wd = data;
Eina_List *l; Eina_List *l;
Evas_Object *eo, *so; Evas_Object *eo, *so;
int i; int changed = -1, i = 0;
int changed = -1;
if (wd->changing) return; if (wd->changing) return;
wd->changing = 1; wd->changing = 1;
/* entry changed */ /* entry changed */
i = 0;
EINA_LIST_FOREACH(wd->entries, l, eo) EINA_LIST_FOREACH(wd->entries, l, eo)
{ {
if (o == eo) if (o == eo)
@ -114,19 +111,14 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
else else
e_widget_cslider_update(wd->vert); e_widget_cslider_update(wd->vert);
/* update the sliders */ /* update the sliders */
i = 0; i = 0;
EINA_LIST_FOREACH(wd->sliders, l, so) EINA_LIST_FOREACH(wd->sliders, l, so)
{ {
if (o != so) if (o != so)
{ e_widget_cslider_update(so);
e_widget_cslider_update(so);
}
else else
{ changed = i;
changed = i;
}
i++; i++;
} }
@ -148,6 +140,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
EINA_LIST_FOREACH(wd->entries, l, eo) EINA_LIST_FOREACH(wd->entries, l, eo)
{ {
char buf[10]; char buf[10];
if (o == eo) continue; if (o == eo) continue;
switch (i) switch (i)
{ {
@ -189,7 +182,7 @@ e_widget_csel_add(Evas *evas, E_Color *color, Eina_Bool alpha_enabled)
{ {
Evas_Object *obj, *o; Evas_Object *obj, *o;
Evas_Object *frame, *table; Evas_Object *frame, *table;
int i; int i = 0;
E_Radio_Group *grp = NULL; E_Radio_Group *grp = NULL;
char *labels[6] = { "R", "G", "B", "H", "S", "V" }; char *labels[6] = { "R", "G", "B", "H", "S", "V" };
E_Widget_Data *wd; E_Widget_Data *wd;
@ -234,7 +227,7 @@ e_widget_csel_add(Evas *evas, E_Color *color, Eina_Bool alpha_enabled)
snprintf(wd->values[i], 10, "%.2f", wd->cv->s); snprintf(wd->values[i], 10, "%.2f", wd->cv->s);
break; break;
case E_COLOR_COMPONENT_V: case E_COLOR_COMPONENT_V:
snprintf(wd->values[i], 11, "%.2f", wd->cv->v); snprintf(wd->values[i], 10, "%.2f", wd->cv->v);
break; break;
} }
@ -262,8 +255,8 @@ e_widget_csel_add(Evas *evas, E_Color *color, Eina_Bool alpha_enabled)
{ {
o = e_widget_label_add(evas, "Alpha"); o = e_widget_label_add(evas, "Alpha");
e_widget_table_object_append(frame, o, 1, i, 1, 1, 1, 1, 0, 0); e_widget_table_object_append(frame, o, 1, i, 1, 1, 1, 1, 0, 0);
o = e_widget_slider_add o = e_widget_slider_add(evas, 1, 0, "%0.0f", 0, 255, 1, 0, NULL,
(evas, 1, 0, "%0.0f", 0, 255, 1, 0, NULL, &(wd->cv->a), 100); &(wd->cv->a), 100);
e_widget_on_change_hook_set(o, _e_wid_cb_alpha_changed, wd); e_widget_on_change_hook_set(o, _e_wid_cb_alpha_changed, wd);
e_widget_table_object_append(frame, o, 2, i, 1, 1, 1, 1, 0, 0); e_widget_table_object_append(frame, o, 2, i, 1, 1, 1, 1, 0, 0);
} }
@ -292,9 +285,5 @@ e_widget_csel_add(Evas *evas, E_Color *color, Eina_Bool alpha_enabled)
wd->well = o; wd->well = o;
e_widget_table_object_append(table, o, 3, 2, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(table, o, 3, 2, 1, 1, 1, 1, 1, 1);
return obj; return obj;
} }