From d4866af3e357f1c82d7b1b080679e10242d3bb8b Mon Sep 17 00:00:00 2001 From: tasn Date: Thu, 12 May 2011 08:38:21 +0000 Subject: [PATCH] Evas font-engine: abort font load even sooner if name is NULL. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@59343 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_font_dir.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/canvas/evas_font_dir.c b/src/lib/canvas/evas_font_dir.c index a0c4b9f..4d94723 100644 --- a/src/lib/canvas/evas_font_dir.c +++ b/src/lib/canvas/evas_font_dir.c @@ -259,8 +259,6 @@ _font_style_name_match(const char *font_name, const char *style_name) { char *style_key = NULL; - if (!font_name) return EINA_FALSE; - if (!style_name) return EINA_FALSE; style_key = strchr(font_name, ':'); if (!style_key) return EINA_FALSE; if (strlen(style_key) > 2) style_key++; @@ -314,14 +312,14 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size) char *nm; Font_Rend_Flags wanted_rend = 0; + if (!name) return NULL; + if (name[0] == 0) return NULL; + if (_font_style_name_match(name, "Italic")) wanted_rend |= FONT_REND_ITALIC; if (_font_style_name_match(name, "Bold")) wanted_rend |= FONT_REND_BOLD; - if (!name) return NULL; - if (name[0] == 0) return NULL; - evas_font_init(); EINA_LIST_FOREACH(fonts_cache, l, fd) -- 2.7.4