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

limit recursion - safety for bad theme config. 

SVN revision: 30080
This commit is contained in:
Carsten Haitzler 2007-05-26 06:45:51 +00:00
parent 8a17d1986e
commit f1d6383852
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/efreet/src/lib/efreet_icon.c
View File

@ -340,6 +340,7 @@ efreet_icon_find_helper(Efreet_Icon_Theme *theme, const char *cache_key,
const char *size)
{
Efreet_Icon *value;
static int recurse = 0;
efreet_icon_theme_cache_check(theme);
@ -350,6 +351,10 @@ efreet_icon_find_helper(Efreet_Icon_Theme *theme, const char *cache_key,
/* go no further if this theme is fake */
if (theme->fake || !theme->valid) return NULL;
/* limit recursion in finding themes and inherited themes to 256 levels */
if (recurse > 256) return NULL;
recurse++;
value = efreet_icon_lookup_icon(theme, icon, size);
/* we didin't find the image check the inherited themes */
@ -365,7 +370,7 @@ efreet_icon_find_helper(Efreet_Icon_Theme *theme, const char *cache_key,
Efreet_Icon_Theme *parent_theme;
parent_theme = efreet_icon_theme_find(parent);
if (!parent_theme) continue;
if ((!parent_theme) || (parent_theme == theme)) continue;
value = efreet_icon_find_helper(parent_theme, cache_key,
icon, size);
@ -385,6 +390,7 @@ efreet_icon_find_helper(Efreet_Icon_Theme *theme, const char *cache_key,
}
}
recurse--;
return value;
}