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

edje_edit: Another instance where we need to check the return of eet_list 

Return could be NULL so check here before derefenrcing ent.

CID 1224764
This commit is contained in:
Stefan Schmidt 2014-09-04 14:44:33 +02:00
parent 703d179eb6
commit ffd1031d2b
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/lib/edje/edje_edit.c
View File

@ -11230,28 +11230,32 @@ edje_edit_clean_save_as(Evas_Object *obj, const char* new_file_name)
}
int count = 0;
char **ent = eet_list(ef, "*", &count);
char **ent;
int i;
int size = 0;
const void * data;
/* copying data */
for (i = 0; i < count; i++)
ent = eet_list(ef, "*", &count);
if (ent)
{
/* Skiping entries that need special saving */
if (!strcmp(ent[i], "edje/file")) continue;
if (!strcmp(ent[i], "edje_sources")) continue;
if (strstr(ent[i], "collection")) continue;
data = eet_read_direct(ef, ent[i], &size);
if (data) eet_write(ef_out, ent[i], data, size, 0);
else
/* copying data */
for (i = 0; i < count; i++)
{
data = eet_read(ef, ent[i], &size);
eet_write(ef_out, ent[i], data, size, 1);
/* Skiping entries that need special saving */
if (!strcmp(ent[i], "edje/file")) continue;
if (!strcmp(ent[i], "edje_sources")) continue;
if (strstr(ent[i], "collection")) continue;
data = eet_read_direct(ef, ent[i], &size);
if (data) eet_write(ef_out, ent[i], data, size, 0);
else
{
data = eet_read(ef, ent[i], &size);
eet_write(ef_out, ent[i], data, size, 1);
}
}
free(ent);
}
free(ent);
/* copying groups */
Edje_Part_Collection_Directory_Entry *ce;