From 8a6b6766aa026d01c18ca8ef5b1b100db2bd6a50 Mon Sep 17 00:00:00 2001 From: Duna Oh Date: Tue, 26 Apr 2016 12:02:20 +0900 Subject: [PATCH] eina: return NULL iterator in all case, not only when safety check is turned on. origin from upstream: https://git.enlightenment.org/core/efl.git/commit/src/lib/eina/eina_hash.c?id=5aa6a73b3461af4d67ba2dfe369ee2da3e11c9b5 Signed-off-by: Duna Oh Change-Id: I329c710efe7d71b4dc0e28004add06f0754cba8e --- src/lib/eina/eina_hash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c index fe2ec51..f950b19 100644 --- a/src/lib/eina/eina_hash.c +++ b/src/lib/eina/eina_hash.c @@ -1221,7 +1221,7 @@ eina_hash_iterator_data_new(const Eina_Hash *hash) { Eina_Iterator_Hash *it; - EINA_SAFETY_ON_NULL_RETURN_VAL(hash, NULL); + if (!hash) return NULL; EINA_MAGIC_CHECK_HASH(hash); it = calloc(1, sizeof (Eina_Iterator_Hash)); @@ -1247,7 +1247,7 @@ eina_hash_iterator_key_new(const Eina_Hash *hash) { Eina_Iterator_Hash *it; - EINA_SAFETY_ON_NULL_RETURN_VAL(hash, NULL); + if (!hash) return NULL; EINA_MAGIC_CHECK_HASH(hash); it = calloc(1, sizeof (Eina_Iterator_Hash)); @@ -1274,7 +1274,7 @@ eina_hash_iterator_tuple_new(const Eina_Hash *hash) { Eina_Iterator_Hash *it; - EINA_SAFETY_ON_NULL_RETURN_VAL(hash, NULL); + if (!hash) return NULL; EINA_MAGIC_CHECK_HASH(hash); it = calloc(1, sizeof (Eina_Iterator_Hash)); -- 2.7.4