enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

eolian: fix eina hash usage so it doesn't consume all your memory 

This makes sure items are checked before being added, so that eina
hash doesn't get confused, add each item thousands of times and
run out of memory.
This commit is contained in:
Daniel Kolesa 2018-02-22 11:18:55 +01:00
parent 665b88204c
commit 26f0c56faf
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/eolian/eo_parser.c
View File

@ -2256,7 +2256,7 @@ eo_parser_database_fill(Eolian_Unit *parent, const char *filename, Eina_Bool eot
if (ret)
{
if (parent != ret)
if ((parent != ret) && !eina_hash_find(parent->children, filename))
eina_hash_add(parent->children, filename, ret);
return ret;
}

9
src/lib/eolian/eolian_database.c
View File

@ -706,8 +706,12 @@ static Eina_Bool
_merge_unit_cb(const Eina_Hash *hash EINA_UNUSED,
const void *key, void *data, void *fdata)
{
if (eina_hash_add((Eina_Hash *)fdata, key, data))
eolian_object_ref((Eolian_Object *)data);
Eina_Hash *dest = fdata;
if (!eina_hash_find(dest, key))
{
eina_hash_add(dest, key, data);
eolian_object_ref((Eolian_Object *)data);
}
return EINA_TRUE;
}
@ -744,6 +748,7 @@ _merge_units_cb(const Eina_Hash *hash EINA_UNUSED,
return EINA_TRUE;
}
static void
_merge_units(Eolian_Unit *unit)
{