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

gfx: Add NULL check to silence coverity 

realloc() can return NULL if size is 0. It's like free().
So, the usage here is correct, and there are probably no
points to interpolate between anyway. I wonder if there
can be commands without points, though.

Fixes CID 1293004
This commit is contained in:
Jean-Philippe Andre 2016-07-13 16:16:02 +09:00
parent 1b6825d3fe
commit 9cf72fe80a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/efl/interfaces/efl_gfx_shape.c
View File

@ -318,7 +318,7 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
Efl_Gfx_Path_Command *cmds;
Efl_Gfx_Property property_from, property_to;
Efl_Gfx_Dash *dash = NULL;
double *pts, *from_pts, *to_pts;
double *pts;
unsigned int i, j;
from_pd = eo_data_scope_get(from, EFL_GFX_SHAPE_MIXIN);
@ -351,18 +351,21 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
memcpy(cmds, from_pd->commands,
sizeof (Efl_Gfx_Path_Command) * from_pd->commands_count);
to_pts = to_pd->points;
from_pts = from_pd->points;
if (pts)
{
double *to_pts = to_pd->points;
double *from_pts = from_pd->points;
for (i = 0; cmds[i] != EFL_GFX_PATH_COMMAND_TYPE_END; i++)
for (j = 0; j < _efl_gfx_path_command_length(cmds[i]); j++)
{
*pts = interpolate(*from_pts, *to_pts, pos_map);
for (i = 0; cmds[i] != EFL_GFX_PATH_COMMAND_TYPE_END; i++)
for (j = 0; j < _efl_gfx_path_command_length(cmds[i]); j++)
{
*pts = interpolate(*from_pts, *to_pts, pos_map);
pts++;
from_pts++;
to_pts++;
}
pts++;
from_pts++;
to_pts++;
}
}
}
pd->points_count = from_pd->points_count;