enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

e theme - fix leak of list of stringshares and be paranoid about strings 

what if the list contains strings that are not sub-paths for some
reason? check lenghts at least are big enough...
This commit is contained in:
Carsten Haitzler 2020-03-09 15:27:58 +00:00
parent 381c12bd19
commit 4368916c2c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/e_theme.c
View File

@ -34,7 +34,7 @@ e_theme_collection_items_find(const char *base EINA_UNUSED, const char *collname
{
Eina_List *list, *list2 = NULL, *l;
const char *s, *s2;
int len = strlen(collname);
size_t len = strlen(collname);
list = elm_theme_group_base_list(NULL, collname);
if (!list) return NULL;
@ -44,8 +44,13 @@ e_theme_collection_items_find(const char *base EINA_UNUSED, const char *collname
size_t slen;
slen = strlen(s);
trans = memcpy(alloca(slen + 1), s, slen + 1);
p = trans + len + 1;
if (slen <= len) goto done;
trans = alloca(slen + 1);
if (!trans) goto done;
memcpy(trans, s, slen + 1);
p = trans + len;
if (*p != '/') goto done;
p++;
if (*p)
{
p2 = strchr(p, '/');
@ -56,6 +61,8 @@ e_theme_collection_items_find(const char *base EINA_UNUSED, const char *collname
}
if (!l) list2 = eina_list_append(list2, eina_stringshare_add(p));
}
done:
eina_stringshare_del(s);
}
return list2;
}