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

* edje: prevent some segv in edje_cc and detect wrong edje file 

before compiling them.

	Patch by Rafael Fonseca <rfonseca@profusion.mobi>.


SVN revision: 49999
This commit is contained in:
Cedric BAIL 2010-07-02 15:37:37 +00:00
parent 87b85132dd
commit ba95606159
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/edje/src/bin/edje_cc_handlers.c
View File

@ -1586,7 +1586,7 @@ st_styles_style_name(void)
stl->name = parse_str(0);
EINA_LIST_FOREACH(edje_file->styles, l, tstl)
{
if ((stl != tstl) && (!strcmp(stl->name, tstl->name)))
if (stl->name && tstl->name && (stl != tstl) && (!strcmp(stl->name, tstl->name)))
{
ERR("%s: Error. parse error %s:%i. There is already a style named \"%s\"",
progname, file_in, line - 1, stl->name);

9
legacy/edje/src/bin/edje_cc_parse.c
View File

@ -644,6 +644,8 @@ compile(void)
int fd;
off_t size;
char *data, *p;
Eina_List *l;
Edje_Style *stl;
if (!tmp_dir)
#ifdef HAVE_EVIL
@ -807,6 +809,13 @@ compile(void)
}
free(data);
close(fd);
EINA_LIST_FOREACH(edje_file->styles, l, stl)
if (!stl->name)
{
ERR("%s: Error. style must have a name.", progname);
exit(-1);
}
}
int