From c9347b1ca2c3f75af771ed6654cc7f46d9eaaa00 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 6 Apr 2016 11:17:05 +0100 Subject: [PATCH] Revert "Eo: Fix rare crash after call_resolve" I'm reverting this because according to jpeg it was possibly fixed in 5284b62e930f0bef0ed3125b3a485e0599451ef8. I reverted this patch after his fix and followed his reproduction cases and it seems that his second patch does indeed fix this issue so this patch is no longer needed. This reverts commit 0862b9d08384bc1d862b90952130ec988f56b33b. --- src/lib/eo/eo.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index d1dd8e8a58..434ab3ec4f 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -347,15 +347,12 @@ _eo_call_resolve(Eo *eo_id, const char *func_name, Eo_Op_Call_Data *call, Eo_Cal if ((const void *)inputklass == cache->index[i].klass) { func = (const op_type_funcs *)cache->entry[i].func; - if (EINA_LIKELY(func->func && func->src)) + call->func = func->func; + if (is_obj) { - call->func = func->func; - if (is_obj) - { - call->data = (char *) obj + cache->off[i].off; - } - return EINA_TRUE; + call->data = (char *) obj + cache->off[i].off; } + return EINA_TRUE; } } #endif