From: Tom Hacohen Date: Fri, 16 May 2014 13:43:09 +0000 (+0100) Subject: Eo: Make it clearer that a NULL deref can't happen. X-Git-Tag: v1.10.0-beta3~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61f3f68670e8e49258edb19e2c2aebdde30b605a;p=platform%2Fupstream%2Fefl.git Eo: Make it clearer that a NULL deref can't happen. We check _current_table for NULL, and then populate it (it's a global) through another function, but we don't really check it's not NULL before using it, we just assume because of an indirect other variable. This confused coveritiy, can confuse humans too, and in general risky (if something changes). CID 1039419 --- diff --git a/src/lib/eo/eo_ptr_indirection.x b/src/lib/eo/eo_ptr_indirection.x index 61fd183..4efe667 100644 --- a/src/lib/eo/eo_ptr_indirection.x +++ b/src/lib/eo/eo_ptr_indirection.x @@ -392,10 +392,11 @@ _eo_id_allocate(const _Eo_Object *obj) if (!entry) { entry = _search_tables(); - if (!entry) - return 0; } + if (!_current_table || !entry) + return 0; + /* [1;max-1] thus we never generate an Eo_Id equal to 0 */ _eo_generation_counter++; if (_eo_generation_counter == MAX_GENERATIONS)