zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=09b2ecec6d84c81e7f22eddb0daacd9412bfd69c
commit 09b2ecec6d84c81e7f22eddb0daacd9412bfd69c
Author: Yeongjong Lee <yj34....@samsung.com>
Date: Wed Sep 25 06:44:56 2019 -0400
efl_ui_layout: fix null pointer dereferences
Summary: If theme doesn't have version data, `version` can be NULL.
Reviewers: zmike
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10146
---
src/lib/elementary/efl_ui_layout.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/lib/elementary/efl_ui_layout.c
b/src/lib/elementary/efl_ui_layout.c
index 8935e017d0..ec5e731dfd 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -547,13 +547,16 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj,
Efl_Ui_Layout_Data *sd)
if (!version)
ERR("Widget(%p) with type '%s' is not providing a version in its
theme!", obj,
efl_class_name_get(efl_class_get(obj)));
- errno = 0;
- sd->version = strtoul(version, NULL, 10);
- if (errno)
+ else
{
- ERR("Widget(%p) with type '%s' is not providing a valid version
in its theme!", obj,
- efl_class_name_get(efl_class_get(obj)));
- sd->version = 0;
+ errno = 0;
+ sd->version = strtoul(version, NULL, 10);
+ if (errno)
+ {
+ ERR("Widget(%p) with type '%s' is not providing a valid
version in its theme!", obj,
+ efl_class_name_get(efl_class_get(obj)));
+ sd->version = 0;
+ }
}
}
if (!version)
--
