bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=eaa06230ddf53a444e37e66034b0e4f8f4b2b0af
commit eaa06230ddf53a444e37e66034b0e4f8f4b2b0af Author: Mike Blumenkrantz <[email protected]> Date: Thu Mar 12 12:50:26 2020 -0400 efl: check config values before passing to non-null function if these config values don't exist, we should return the inlined defaults Reviewed-by: Marcel Hollerbach <[email protected]> Differential Revision: https://phab.enlightenment.org/D11499 --- src/lib/efl/Efl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 81e274883b..ec6f168a8b 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -253,7 +253,7 @@ efl_config_bool_get(const Efl_Config *obj, const char * name) { Eina_Value *v = efl_config_get(obj, name); Eina_Bool b = 0; - if (eina_value_type_get(v) == EINA_VALUE_TYPE_UCHAR) + if (v && eina_value_type_get(v) == EINA_VALUE_TYPE_UCHAR) eina_value_get(v, &b); eina_value_free(v); return b; @@ -275,7 +275,7 @@ efl_config_int_get(const Efl_Config *obj, const char * name) { Eina_Value *v = efl_config_get(obj, name); int b = 0; - if (eina_value_type_get(v) == EINA_VALUE_TYPE_INT) + if (v && eina_value_type_get(v) == EINA_VALUE_TYPE_INT) eina_value_get(v, &b); eina_value_free(v); return b; @@ -297,7 +297,7 @@ efl_config_double_get(const Efl_Config *obj, const char * name) { Eina_Value *v = efl_config_get(obj, name); double b = 0; - if (eina_value_type_get(v) == EINA_VALUE_TYPE_DOUBLE) + if (v && eina_value_type_get(v) == EINA_VALUE_TYPE_DOUBLE) eina_value_get(v, &b); eina_value_free(v); return b; @@ -319,7 +319,7 @@ efl_config_string_get(const Efl_Config *obj, const char *name) { Eina_Value *v = efl_config_get(obj, name); Eina_Stringshare *s = 0; - if (eina_value_type_get(v) == EINA_VALUE_TYPE_STRING) + if (v && eina_value_type_get(v) == EINA_VALUE_TYPE_STRING) { const char *b = 0; eina_value_get(v, &b); --
