rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0ba8fdb27c88ab5c964fb8ac2bb010af6e6f9dd4
commit 0ba8fdb27c88ab5c964fb8ac2bb010af6e6f9dd4
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Wed Dec 2 11:47:00 2015 +0200
goupedit_calc: fix segfault on incorrect box layout
---
src/bin/ui/workspace/groupedit_calc.c | 38 +++++++++++++++++++----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/bin/ui/workspace/groupedit_calc.c
b/src/bin/ui/workspace/groupedit_calc.c
index e7417bc..9943ca8 100644
--- a/src/bin/ui/workspace/groupedit_calc.c
+++ b/src/bin/ui/workspace/groupedit_calc.c
@@ -627,28 +627,32 @@ _edje_box_layout_builtin_find(const char *name)
};
const struct edje_box_layout_builtin *base;
- switch (name[0])
+ if (name)
{
- case 'h':
- base = _edje_box_layout_builtin + 0;
- break;
-
- case 's':
- base = _edje_box_layout_builtin + 4;
- break;
+ switch (name[0])
+ {
+ case 'h':
+ base = _edje_box_layout_builtin + 0;
+ break;
- case 'v':
- base = _edje_box_layout_builtin + 5;
- break;
+ case 's':
+ base = _edje_box_layout_builtin + 4;
+ break;
- default:
- return NULL;
- }
+ case 'v':
+ base = _edje_box_layout_builtin + 5;
+ break;
- for (; (base->name) && (base->name[0] == name[0]); base++)
- if (strcmp(base->name, name) == 0)
- return base->cb;
+ default:
+ return NULL;
+ }
+ for (; (base->name) && (base->name[0] == name[0]); base++)
+ if (strcmp(base->name, name) == 0)
+ return base->cb;
+ }
+ else
+ return _edje_box_layout_builtin[0].cb;
return NULL;
}
--
