diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-26 17:00:27 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-26 17:58:07 +0900 |
commit | 0ae529ac196a5b212e2b7386aef9978c4cfa095c (patch) | |
tree | e595a510127504be457b5a2fa8fa02504eb37cc1 /src | |
parent | f839905184ef084fad55f3deadd51b405768a49c (diff) |
eo: Fix crashes with call cache after init cycle
It's not enough to check the init generation count, if the cache data is
not reset properly.
This patch adds safety in two ways:
1. Actually reset the op call cache when we detect a new generation
2. Verify that we don't return NULL function pointer
The 1st point is absolutely necessary, 2nd is optional (extra cost of
one if()).
@fix
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/eo/Eo.h | 1 | ||||
-rw-r--r-- | src/lib/eo/eo.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index fe5a550316..ea924ab927 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h | |||
@@ -1231,6 +1231,7 @@ typedef struct _Efl_Object_Call_Cache | |||
1231 | // hits. | 1231 | // hits. |
1232 | #define EFL_FUNC_COMMON_OP_END(Obj, Name, DefRet) \ | 1232 | #define EFL_FUNC_COMMON_OP_END(Obj, Name, DefRet) \ |
1233 | __##Name##_op_create: \ | 1233 | __##Name##_op_create: \ |
1234 | if (EINA_UNLIKELY(___cache.op != EFL_NOOP)) memset(&___cache, 0, sizeof(___cache)); \ | ||
1234 | ___cache.op = _efl_object_op_api_id_get(EFL_FUNC_COMMON_OP_FUNC(Name), Obj, #Name, __FILE__, __LINE__); \ | 1235 | ___cache.op = _efl_object_op_api_id_get(EFL_FUNC_COMMON_OP_FUNC(Name), Obj, #Name, __FILE__, __LINE__); \ |
1235 | if (___cache.op == EFL_NOOP) return DefRet; \ | 1236 | if (___cache.op == EFL_NOOP) return DefRet; \ |
1236 | ___cache.generation = _efl_object_init_generation; \ | 1237 | ___cache.generation = _efl_object_init_generation; \ |
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index b4bd760b44..f7358db12f 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c | |||
@@ -498,6 +498,7 @@ ok_klass_back: | |||
498 | call->func = func->func; | 498 | call->func = func->func; |
499 | if (is_obj) | 499 | if (is_obj) |
500 | call->data = (char *)obj + cache->off[i].off; | 500 | call->data = (char *)obj + cache->off[i].off; |
501 | if (EINA_UNLIKELY(!call->func)) goto err_cache_op; | ||
501 | return EINA_TRUE; | 502 | return EINA_TRUE; |
502 | } | 503 | } |
503 | } | 504 | } |