[EGIT] [core/efl] master 03/06: efl_ui/table: avoid exploding stack with lots of subobjects

[Mike Blumenkrantz]

cedric pushed a commit to branch master.

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

commit 8e3877cc230b9d24e50982c3997c5f4df7eb45c3
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Wed Jul 17 13:08:58 2019 -0400

    efl_ui/table: avoid exploding stack with lots of subobjects
    
    using alloca like this without any limits is dangerous, so switch to
    malloc here in such cases
    
    Reviewed-by: Marcel Hollerbach <m...@marcel-hollerbach.de>
    Differential Revision: https://phab.enlightenment.org/D9344
---
 src/lib/elementary/efl_ui_table_layout.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/efl_ui_table_layout.c 
b/src/lib/elementary/efl_ui_table_layout.c
index 391878019e..013a35a6cd 100644
--- a/src/lib/elementary/efl_ui_table_layout.c
+++ b/src/lib/elementary/efl_ui_table_layout.c
@@ -228,6 +228,7 @@ _efl_ui_table_custom_layout(Efl_Ui_Table *ui_table, 
Efl_Ui_Table_Data *pd)
    int (*_efl_ui_table_item_pos_get[2])(Table_Calc *, Item_Calc *, Eina_Bool);
    int (*_efl_ui_table_item_size_get[2])(Table_Calc *, Item_Calc *, Eina_Bool);
    Table_Calc table_calc;
+   Eina_Bool do_free;
 
    count = pd->count;
 
@@ -250,7 +251,17 @@ _efl_ui_table_custom_layout(Efl_Ui_Table *ui_table, 
Efl_Ui_Table_Data *pd)
    memset(table_calc.cell_calc[0], 0, cols * sizeof(Cell_Calc));
    memset(table_calc.cell_calc[1], 0, rows * sizeof(Cell_Calc));
 
-   items = alloca(count * sizeof(*items));
+   /* Item_Calc struct is currently 152 bytes.
+    * this is pretty big to be allocating a huge number of, and we don't want 
to explode the stack
+    */
+   do_free = count >= 500;
+   if (do_free)
+     {
+        items = malloc(count * sizeof(*items));
+        EINA_SAFETY_ON_NULL_RETURN(items);
+     }
+   else
+     items = alloca(count * sizeof(*items));
 #ifdef DEBUG
    memset(items, 0, count * sizeof(*items));
 #endif
@@ -384,4 +395,5 @@ _efl_ui_table_custom_layout(Efl_Ui_Table *ui_table, 
Efl_Ui_Table_Data *pd)
                                         EINA_SIZE2D(table_calc.want[0],
                                                     table_calc.want[1]));
    efl_event_callback_call(ui_table, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
+   if (do_free) free(items);
 }

--