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

* edje: remove possible case of segv on low mem. 

SVN revision: 53863
This commit is contained in:
Cedric BAIL 2010-10-25 12:38:04 +00:00
parent 4d36ee36e2
commit b086f94813
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/edje/src/lib/edje_match.c
View File

@ -408,6 +408,9 @@ edje_match_programs_exec_check_finals(const size_t *signal_finals,
size_t i;
size_t j;
/* when not enought memory, they could be NULL */
if (!signal_finals || !source_finals) return EINA_TRUE;
for (i = 0; i < signal_states->size; ++i)
{
if (signal_states->states[i].pos >= signal_finals[signal_states->states[i].idx])
@ -540,10 +543,13 @@ edje_match_collection_dir_exec(const Edje_Patterns *ppat,
Edje_States *result;
Eina_Bool r = EINA_FALSE;
/* under high memory presure, it could be NULL */
if (!ppat) return EINA_FALSE;
_edje_match_patterns_exec_init_states(ppat->states, ppat->patterns_size, ppat->max_length);
result = _edje_match_fn(ppat, string, ppat->states);
if (result)
r = _edje_match_collection_dir_exec_finals(ppat->finals, result);
@ -563,6 +569,9 @@ edje_match_programs_exec(const Edje_Patterns *ppat_signal,
Edje_States *source_result;
Eina_Bool r = EINA_FALSE;
/* under high memory presure, they could be NULL */
if (!ppat_source || !ppat_signal) return EINA_FALSE;
_edje_match_patterns_exec_init_states(ppat_signal->states,
ppat_signal->patterns_size,
ppat_signal->max_length);
@ -596,6 +605,9 @@ edje_match_callback_exec(Edje_Patterns *ppat_signal,
Edje_States *source_result;
int r = 0;
/* under high memory presure, they could be NULL */
if (!ppat_source || !ppat_signal) return 0;
ppat_signal->ref++;
ppat_source->ref++;
_edje_match_patterns_exec_init_states(ppat_signal->states,
@ -629,6 +641,8 @@ edje_match_callback_exec(Edje_Patterns *ppat_signal,
void
edje_match_patterns_free(Edje_Patterns *ppat)
{
if (!ppat) return ;
ppat->delete_me = 1;
ppat->ref--;
if (ppat->ref > 0) return;