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

efl_ui_table: hardening of pack_at function 

_pack_at is used to add new subobjects to the table. When a object is
already part of this table, then we should not add it again. Additional,
when there is already a gi structure, but the parent is something else,
then we should NOT just reuse this struct, otherwise we might use a
struct reference that we do not own. The struct could be owned by
another table widget.

The test must be adjusted, before we did not error on adding a widget
twice. Now we do (just like in box). Hence we should not do that in
test.

Reviewed-by: YeongJong Lee <yj34.lee@samsung.com>
Differential Revision: https://phab.enlightenment.org/D8554
This commit is contained in:
Marcel Hollerbach 2019-04-04 13:24:59 +02:00
parent 6440e509a0
commit 48778f3cfb
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/elementary/efl_ui_table.c
View File

@ -306,6 +306,18 @@ _pack_at(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj,
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
gi = efl_key_data_get(subobj, TABLE_ITEM_KEY);
if (gi && efl_ui_widget_parent_get(subobj) == obj)
{
ERR("subobj %p %s is already added to this", subobj, efl_class_name_get(subobj) );
return EINA_FALSE;
}
else if (gi && efl_ui_widget_parent_get(subobj) != obj)
{
gi = NULL;
}
if (col < 0) col = 0;
if (row < 0) row = 0;
@ -327,22 +339,10 @@ _pack_at(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj,
col, row, colspan, rowspan, pd->req_cols, pd->req_rows);
}
if (obj == elm_widget_parent_widget_get(subobj))
{
gi = efl_key_data_get(subobj, TABLE_ITEM_KEY);
if (gi)
{
gi->col = col;
gi->row = row;
gi->col_span = colspan;
gi->row_span = rowspan;
gi->linear = EINA_FALSE;
}
else ERR("object is a child but internal data was not found!");
}
if (!gi)
{
if (!elm_widget_sub_object_add(obj, subobj))
return EINA_FALSE;
gi = calloc(1, sizeof(*gi));
if (!gi) return EINA_FALSE;
gi->col = col;
@ -356,7 +356,6 @@ _pack_at(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subobj,
eina_inlist_append(EINA_INLIST_GET(pd->items), EINA_INLIST_GET(gi));
efl_key_data_set(subobj, TABLE_ITEM_KEY, gi);
elm_widget_sub_object_add(obj, subobj);
efl_event_callback_legacy_call(obj, EFL_CONTAINER_EVENT_CONTENT_ADDED, subobj);
efl_event_callback_array_add(subobj, subobj_callbacks(), obj);
}

5
src/tests/elementary/efl_ui_test_table.c
View File

@ -341,11 +341,12 @@ EFL_START_TEST (efl_ui_table_layout_update_matrix)
{
for (j = 0; j < 3; j++)
{
btn[3 * i + j] = efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_pack_table(layout, efl_added, i, j, 1, 1));
btn[3 * i + j] = efl_add(EFL_UI_BUTTON_CLASS, layout);
if ((i == 2) && (j == 1))
efl_pack_table(layout, btn[3 * i + j], i, j, 1, 2);
else
efl_pack_table(layout, btn[3 * i + j], i, j, 1, 1);
}
}
for (i = 0; i < max_index; i++)