raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f149b44b857fe82521a5ed1798a584d6c7cc9e04

commit f149b44b857fe82521a5ed1798a584d6c7cc9e04
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Thu Dec 26 12:46:26 2013 +0900

    evas - protect against table cache being null and then used
---
 src/lib/evas/canvas/evas_object_table.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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)
    Evas_Object_Table_Cache *c = priv->cache;
    int size;
 
+   if (!c) return;
    c->total.expands.v = 0;
    c->total.expands.h = 0;
    c->total.min.w = 0;
@@ -784,8 +785,10 @@ _evas_object_table_calculate_layout_regular(Evas_Object 
*o, Evas_Object_Table_Da
    Evas_Coord *cols = NULL, *rows = NULL;
    Evas_Coord x, y, w, h;
 
-   evas_object_geometry_get(o, &x, &y, &w, &h);
    c = priv->cache;
+   if (!c) return;
+
+   evas_object_geometry_get(o, &x, &y, &w, &h);
 
    /* handle horizontal */
    if ((c->total.expands.h <= 0) || (c->total.min.w >= w))

-- 


Reply via email to