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

Evas Text: avoid SIGSEV while ellipsis recalculation 

Summary:
Fix Segmentation Fault when TEXT part getting resized and when it has
some params (for example ellipsis).

Fix T2640
@fix

Test Plan: Refer to T2640

Reviewers: raster, Hermet, seoz, herdsman, cedric, reutskiy.v.v, NikaWhite

Subscribers: stefan_schmidt, tasn, cedric

Maniphest Tasks: T2640

Differential Revision: https://phab.enlightenment.org/D2944
This commit is contained in:
Vitalii Vorobiov 2015-11-04 13:58:58 +09:00 committed by Carsten Haitzler (Rasterman)
parent 4ce59a4f08
commit aefcb11444
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib/evas/canvas/evas_object_text.c
View File

@ -879,21 +879,27 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t
/* FIXME: We shouldn't do anything. */
}
int cut = ENFN->font_last_up_to_pos(ENDT,
o->font,
&itr->text_props,
ellip_frame - (advance + l + r),
0);
if (cut >= 0)
/* In case when we reach end of itr list, and have NULL */
int cut = -1;
if (itr && (itr != end_ellip_it))
{
end_ellip_it->text_pos = itr->text_pos + cut;
end_ellip_it->visual_pos = itr->visual_pos + cut;
if (_layout_text_item_trim(obj, o, itr, cut, EINA_TRUE))
cut = ENFN->font_last_up_to_pos(ENDT,
o->font,
&itr->text_props,
ellip_frame - (advance + l + r),
0);
if (cut >= 0)
{
itr = (Evas_Object_Text_Item *) EINA_INLIST_GET(itr)->next;
end_ellip_it->text_pos = itr->text_pos + cut;
end_ellip_it->visual_pos = itr->visual_pos + cut;
if (_layout_text_item_trim(obj, o, itr, cut, EINA_TRUE))
{
itr = (Evas_Object_Text_Item *) EINA_INLIST_GET(itr)->next;
}
}
}
/* Remove the rest of the items */
while (itr)
{