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

edje_externals: add safety check for NULL pointer 

Summary: Dereferencing null pointers in external_signal()

Reviewers: bdilly, raster, woohyun, cedric

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2688

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Minwoo, Lee 2015-06-17 14:25:29 +02:00 committed by Cedric BAIL
parent f1778f1884
commit 1f93f2c712
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
legacy/elementary/src/edje_externals/elm.c
View File

@ -47,6 +47,9 @@ external_signal(void *data EINA_UNUSED, Evas_Object *obj, const char *sig,
char *_signal = strdup(sig);
char *p = _signal;
Evas_Object *content;
Edje_External_Type *type;
if (!p) goto on_error;
while ((*p!='\0') && (*p!=']'))
p++;
@ -55,26 +58,33 @@ external_signal(void *data EINA_UNUSED, Evas_Object *obj, const char *sig,
if ((*p=='\0') || (*(p+1)!=':'))
{
ERR("Invalid External Signal received: '%s' '%s'", sig, source);
free(_signal);
return ;
goto on_error;
}
*p = '\0';
p+=2; //jump ']' and ':'
Edje_External_Type *type = evas_object_data_get(obj, "Edje_External_Type");
type = evas_object_data_get(obj, "Edje_External_Type");
if (!type)
{
ERR("no external type for object %p", obj);
goto on_error;
}
if (!type->content_get)
{
ERR("external type '%s' from module '%s' does not provide content_get()",
type->module_name, type->module);
free(_signal);
return ;
goto on_error;
}
content = type->content_get(type->data, obj, _signal);
free(_signal);
if (content)
edje_object_signal_emit(content, sig + (p - _signal), source);
on_error:
if (_signal) free(_signal);
return;
}
const char *