From 88f1723ccb1a45ca6b3adec4cbff2ead86522c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Tue, 31 Aug 2010 19:32:08 +0000 Subject: [PATCH] Avoiding access in NULL hash and little fixes. If there isn't a font, the hash is NULL. So, just check before to avoid problems. Moreover, removing one line that had been lost in code generate of fonts parts and moving it declaration for the right context By: Fabiano Fidencio SVN revision: 51786 --- legacy/edje/src/lib/edje_edit.c | 34 ++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c index 2d5ff19841..8adfd8ef5a 100644 --- a/legacy/edje/src/lib/edje_edit.c +++ b/legacy/edje/src/lib/edje_edit.c @@ -6051,7 +6051,6 @@ _edje_generate_source(Evas_Object *obj) Eina_Strbuf *buf; Eina_List *l, *ll; - Eina_Iterator *it; Edje_Font_Directory_Entry *fnt; char *entry; @@ -6101,23 +6100,28 @@ _edje_generate_source(Evas_Object *obj) } /* Fonts */ - it = eina_hash_iterator_data_new(ed->file->fonts); - if (it) + if (ed->file->fonts) { - BUF_APPEND(I0"fonts {\n"); + Eina_Iterator *it; - EINA_ITERATOR_FOREACH(it, fnt) - BUF_APPENDF(I1"font: \"%s\" \"%s\";\n", fnt->file, - fnt->entry); - - BUF_APPEND(I0"}\n\n"); - eina_list_free(ll); - - if (!ret) + it = eina_hash_iterator_data_new(ed->file->fonts); + if (it) { - ERR("Generating EDC for Fonts"); - eina_strbuf_free(buf); - return NULL; + BUF_APPEND(I0"fonts {\n"); + + EINA_ITERATOR_FOREACH(it, fnt) + BUF_APPENDF(I1"font: \"%s\" \"%s\";\n", fnt->file, + fnt->entry); + + BUF_APPEND(I0"}\n\n"); + eina_iterator_free(it); + + if (!ret) + { + ERR("Generating EDC for Fonts"); + eina_strbuf_free(buf); + return NULL; + } } }