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

edje: Fix issue of null pointer dereference 

Coverity reports that 'text' here is a null pointer dereference so
check for valid 'text' variable before trying to use it.

Fixes Coverity CID1267490

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2016-07-11 11:19:01 -04:00
parent a8eb31f146
commit ce9379398f
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/edje/edje_load.c
View File

@ -1041,21 +1041,31 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
Edje_Part_Description_Text *text;
text = (Edje_Part_Description_Text *)rp->param1.description;
if (ed->file->feature_ver < 1)
if (text)
{
text->text.id_source = -1;
text->text.id_text_source = -1;
if (ed->file->feature_ver < 1)
{
text->text.id_source = -1;
text->text.id_text_source = -1;
}
if ((rp->type == EDJE_RP_TYPE_TEXT) &&
(rp->typedata.text))
{
if (text->text.id_source >= 0)
{
rp->typedata.text->source =
ed->table_parts[text->text.id_source % ed->table_parts_size];
}
if (text->text.id_text_source >= 0)
{
rp->typedata.text->text_source =
ed->table_parts[text->text.id_text_source % ed->table_parts_size];
}
}
}
if ((rp->type == EDJE_RP_TYPE_TEXT) &&
(rp->typedata.text))
{
if (text->text.id_source >= 0)
rp->typedata.text->source = ed->table_parts[text->text.id_source % ed->table_parts_size];
if (text->text.id_text_source >= 0)
rp->typedata.text->text_source = ed->table_parts[text->text.id_text_source % ed->table_parts_size];
}
if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
{
_edje_entry_real_part_init(ed, rp);