From 36261c8bd53ddc5213e2cfe7dca9913001a4f28a Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:42:56 +0000 Subject: [PATCH] Evas textblock: Fixed a segfault with regular formats (ones without size explicitly set). SVN revision: 56515 --- .../evas/src/lib/canvas/evas_object_textblock.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 8d15888ecb..f69cfe50a7 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -2213,12 +2213,18 @@ _layout_line_finalize(Ctxt *c, Evas_Object_Textblock_Format *fmt) switch (fi->size) { case SIZE: - p = strstr(s, " size="); - p += 6; - if (sscanf(p, "%ix%i", &w, &h) == 2) + if (!strncmp(s, "item", 4)) { - w = w * c->obj->cur.scale; - h = h * c->obj->cur.scale; + p = strstr(s, " size="); + if (p) + { + p += 6; + if (sscanf(p, "%ix%i", &w, &h) == 2) + { + w = w * c->obj->cur.scale; + h = h * c->obj->cur.scale; + } + } } break; case SIZE_REL: