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

Evas textblock: remove checks for impossible null derefs. 

This improves code clarity based on input from coverity.

CID1190401
CID1190402
This commit is contained in:
Tom Hacohen 2014-08-12 09:52:18 +01:00
parent add6c216a8
commit 1d6960867d
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -3841,8 +3841,7 @@ skip:
ti->parent.text_pos, run_len, EVAS_TEXT_PROPS_MODE_SHAPE); ti->parent.text_pos, run_len, EVAS_TEXT_PROPS_MODE_SHAPE);
} }
while (queue && while ((queue->start + queue->off) < (run_start + run_len))
((queue->start + queue->off) < (run_start + run_len)))
{ {
Evas_Object_Textblock_Text_Item *new_ti; Evas_Object_Textblock_Text_Item *new_ti;
@ -3856,17 +3855,11 @@ skip:
evas_common_text_props_split(&ti->text_props, &new_ti->text_props, evas_common_text_props_split(&ti->text_props, &new_ti->text_props,
new_ti->parent.text_pos - ti->parent.text_pos); new_ti->parent.text_pos - ti->parent.text_pos);
if (ti) _layout_text_append_add_logical_item(c, ti, rel);
{ ti = new_ti;
_layout_text_append_add_logical_item(c, ti, rel);
ti = new_ti;
}
} }
if (ti) _layout_text_append_add_logical_item(c, ti, rel);
{
_layout_text_append_add_logical_item(c, ti, rel);
}
str += run_len; str += run_len;
script_len -= run_len; script_len -= run_len;