From 31815b7a255085dea26991a9d76a61700dffd49a Mon Sep 17 00:00:00 2001 From: Youngbok Shin Date: Tue, 20 Sep 2016 15:02:03 +0900 Subject: [PATCH] evas textblock: remove NULL checking after dereferencing Summary: c->paragraphs couldn't be NULL if it is created by _layout_paragraph_new() well. So, NULL checking should be moved to after _layout_paragraph_new(). Test Plan: N/A Reviewers: raster, cedric, tasn, herdsman Subscribers: jpeg Differential Revision: https://phab.enlightenment.org/D4300 Change-Id: Ia30c6b431af394f4ea398dfa60cbed3be4e8f65b Signed-off-by: Youngbok Shin --- src/lib/evas/canvas/evas_object_textblock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 24f7980..82fba1b 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -6087,6 +6087,9 @@ _layout(const Evas_Object *eo_obj, int w, int h, int *w_ret, int *h_ret) if (!c->paragraphs) { _layout_paragraph_new(c, NULL, EINA_TRUE); + + if (!c->paragraphs) return; + o->paragraphs = c->paragraphs; } c->par = (Evas_Object_Textblock_Paragraph *) @@ -6150,7 +6153,7 @@ _layout(const Evas_Object *eo_obj, int w, int h, int *w_ret, int *h_ret) } /* Get the last visible paragraph in the layout */ - if (!last_vis_par && c->paragraphs) + if (!last_vis_par) last_vis_par = (Evas_Object_Textblock_Paragraph *) EINA_INLIST_GET(c->paragraphs)->last; -- 2.7.4