summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_table.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-26 12:46:26 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-26 12:51:52 +0900
commitf149b44b857fe82521a5ed1798a584d6c7cc9e04 (patch)
tree979f2fd211e9c2962cf0c20fe36ccb04a7cfa5c8 /src/lib/evas/canvas/evas_object_table.c
parent76d8532b5465362f85b75a2a7a5cc3c419304a92 (diff)
evas - protect against table cache being null and then used
Diffstat (limited to 'src/lib/evas/canvas/evas_object_table.c')
-rw-r--r--src/lib/evas/canvas/evas_object_table.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 624c6b2..07be0be 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -207,6 +207,7 @@ _evas_object_table_cache_reset(Evas_Object_Table_Data *priv)
207 Evas_Object_Table_Cache *c = priv->cache; 207 Evas_Object_Table_Cache *c = priv->cache;
208 int size; 208 int size;
209 209
210 if (!c) return;
210 c->total.expands.v = 0; 211 c->total.expands.v = 0;
211 c->total.expands.h = 0; 212 c->total.expands.h = 0;
212 c->total.min.w = 0; 213 c->total.min.w = 0;
@@ -784,8 +785,10 @@ _evas_object_table_calculate_layout_regular(Evas_Object *o, Evas_Object_Table_Da
784 Evas_Coord *cols = NULL, *rows = NULL; 785 Evas_Coord *cols = NULL, *rows = NULL;
785 Evas_Coord x, y, w, h; 786 Evas_Coord x, y, w, h;
786 787
787 evas_object_geometry_get(o, &x, &y, &w, &h);
788 c = priv->cache; 788 c = priv->cache;
789 if (!c) return;
790
791 evas_object_geometry_get(o, &x, &y, &w, &h);
789 792
790 /* handle horizontal */ 793 /* handle horizontal */
791 if ((c->total.expands.h <= 0) || (c->total.min.w >= w)) 794 if ((c->total.expands.h <= 0) || (c->total.min.w >= w))