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

fix possible resource leak in edje entry - coverity spotted 

this should fix CID 1193228
This commit is contained in:
Carsten Haitzler 2014-08-13 15:11:06 +09:00
parent dcc55bbfd4
commit 8a7e70705c
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/edje/edje_entry.c
View File

@ -1828,17 +1828,30 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
else en->composing = EINA_FALSE;
if (!en->composing)
{
free(compres);
compres = NULL;
_compose_seq_reset(en);
if (ev->string && (!ev->string[1]) && (ev->string[0] < 0x20)) goto end;
if (ev->string && (!ev->string[1]) && (ev->string[0] < 0x20))
goto end;
}
else
{
free(compres);
compres = NULL;
goto end;
}
else goto end;
}
else
{
if (_is_modifier(ev->key)) goto end;
en->seq = eina_list_append(en->seq, eina_stringshare_add(ev->key));
state = ecore_compose_get(en->seq, &compres);
if (state == ECORE_COMPOSE_NONE) _compose_seq_reset(en);
if (state == ECORE_COMPOSE_NONE)
{
_compose_seq_reset(en);
free(compres);
compres = NULL;
}
else if (state == ECORE_COMPOSE_DONE)
{
_compose_seq_reset(en);
@ -1847,8 +1860,15 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
string = compres;
free_string = EINA_TRUE;
}
else free(compres);
compres = NULL;
}
else
{
free(compres);
compres = NULL;
goto end;
}
else goto end;
}
if (string)
{
@ -1889,8 +1909,8 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
cursor_changed = EINA_TRUE;
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
if (free_string) free(string);
}
if (free_string) free(string);
}
end:
if (!cursor_changed &&