tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1d6960867d4d50b5a2ce65bac0f410cb334fbdd5
commit 1d6960867d4d50b5a2ce65bac0f410cb334fbdd5 Author: Tom Hacohen <[email protected]> Date: Tue Aug 12 09:52:18 2014 +0100 Evas textblock: remove checks for impossible null derefs. This improves code clarity based on input from coverity. CID1190401 CID1190402 --- src/lib/evas/canvas/evas_object_textblock.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 8547090..8e03385 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -3841,8 +3841,7 @@ skip: ti->parent.text_pos, run_len, EVAS_TEXT_PROPS_MODE_SHAPE); } - while (queue && - ((queue->start + queue->off) < (run_start + run_len))) + while ((queue->start + queue->off) < (run_start + run_len)) { Evas_Object_Textblock_Text_Item *new_ti; @@ -3856,18 +3855,12 @@ skip: evas_common_text_props_split(&ti->text_props, &new_ti->text_props, new_ti->parent.text_pos - ti->parent.text_pos); - if (ti) - { - _layout_text_append_add_logical_item(c, ti, rel); - ti = new_ti; - } - } - - if (ti) - { _layout_text_append_add_logical_item(c, ti, rel); + ti = new_ti; } + _layout_text_append_add_logical_item(c, ti, rel); + str += run_len; script_len -= run_len; } --
