kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efreet: Fix efreet_init_parse for non existent file 

The conversion to eina_file_map() in r78179 broke the error path of
efreet_init_parse(). Particularly if file doesn't exist. Since the variables
were not initialized it was trying to operate on random values from the stack.
So I got the following crash on E17:

#0  0x00007f238b0bbd67 in waitpid () from /usr/lib/libpthread.so.0
#1  0x00000000004397a3 in e_alert_show ()
#2  0x0000000000526392 in e_sigseg_act ()
#3  <signal handler called>
#4  0x0000000000000031 in ?? ()
#5  0x00007f239315df0f in efreet_ini_parse (file=file@entry=0x7fff39ce46f0 "/home/lucas/local/share/enlightenment/applications/defaults.list")
    at /home/lucas/p/e-svn/trunk/efreet/src/lib/efreet_ini.c:245
#6  0x00007f239315e100 in efreet_ini_new (file=0x7fff39ce46f0 "/home/lucas/local/share/enlightenment/applications/defaults.list")
    at /home/lucas/p/e-svn/trunk/efreet/src/lib/efreet_ini.c:82
#7  0x0000000000538174 in _e_util_default_terminal_get ()
#8  0x00000000005382dc in e_util_terminal_desktop_get ()
#9  0x00007f23706a1065 in e_fwin_init () from /home/lucas/local/lib/enlightenment/modules/fileman/linux-gnu-x86_64-ver-pre-svn-08/module.so
#10 0x00007f237069b524 in e_modapi_init () from /home/lucas/local/lib/enlightenment/modules/fileman/linux-gnu-x86_64-ver-pre-svn-08/module.so
#11 0x000000000050420d in e_module_enable ()
#12 0x0000000000504e77 in _e_module_cb_idler ()
#13 0x00007f238da22739 in _ecore_call_task_cb (data=<optimized out>, func=<optimized out>) at /home/lucas/p/e-svn/trunk/ecore/src/lib/ecore/ecore_private.h:265
#14 _ecore_idle_enterer_call () at /home/lucas/p/e-svn/trunk/ecore/src/lib/ecore/ecore_idle_enterer.c:234
#15 0x00007f238da24c1b in _ecore_main_loop_iterate_internal (once_only=once_only@entry=0) at /home/lucas/p/e-svn/trunk/ecore/src/lib/ecore/ecore_main.c:1826
#16 0x00007f238da252c7 in ecore_main_loop_begin () at /home/lucas/p/e-svn/trunk/ecore/src/lib/ecore/ecore_main.c:934
#17 0x0000000000436167 in main ()

Besides initializing the variables, there's no need to "goto" if the file
doesn't exist.... just return.




SVN revision: 78272
This commit is contained in:
Lucas De Marchi 2012-10-19 23:33:05 +00:00
parent 22cc05a9fe
commit 2a8b05eb03
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/efreet/src/lib/efreet_ini.c
View File

@ -94,13 +94,14 @@ efreet_ini_new(const char *file)
static Eina_Hash *
efreet_ini_parse(const char *file)
{
Eina_File *f;
Eina_Hash *data = NULL, *section = NULL;
Eina_Iterator *it = NULL;
Eina_File_Line *line;
Eina_Hash *data, *section = NULL;
Eina_Iterator *it;
Eina_File *f;
f = eina_file_open(file, EINA_FALSE);
if (!f) goto error;
if (!f)
return NULL;
data = eina_hash_string_small_new(EINA_FREE_CB(eina_hash_free));
if (!data) goto error;
@ -243,7 +244,8 @@ efreet_ini_parse(const char *file)
error:
if (data) eina_hash_free(data);
if (it) eina_iterator_free(it);
if (f) eina_file_close(f);
eina_file_close(f);
return NULL;
}