From 671fc92f086c3c06697bbf1442bfd7667914235b Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 10 May 2018 16:41:20 -0700 Subject: [PATCH] eina: check the type before looking at anything else to avoid triggering valgrind warning. --- src/lib/eina/eina_inline_value.x | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/eina/eina_inline_value.x b/src/lib/eina/eina_inline_value.x index 0bc268af52..a1a63143bf 100644 --- a/src/lib/eina/eina_inline_value.x +++ b/src/lib/eina/eina_inline_value.x @@ -538,11 +538,10 @@ eina_value_pget(const Eina_Value *value, void *ptr) static inline const Eina_Value_Type * eina_value_type_get(const Eina_Value *value) { - const Eina_Value empty = EINA_VALUE_EMPTY; - EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL); // Trigger warning if the type is NULL, but the value is != EINA_VALUE_EMTPY. - if (memcmp(value, &empty, sizeof (Eina_Value))) + if (!value->type && + value->value._guarantee) EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(value->type), NULL); return value->type; }