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

Evas masking: Fix double free() with scaled images 

The function image_scaled_update() frees() the old scaled image
passed as input if it doesn't match the old dimensions. This commit
will avoid double frees.
This commit is contained in:
Jean-Philippe Andre 2015-02-27 17:56:49 +09:00
parent ab89dc401c
commit 2e3ee0e658
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/evas/canvas/evas_render.c
View File

@ -1850,8 +1850,6 @@ evas_render_mask_subrender(Evas_Public_Data *evas,
if (scaled)
{
done = EINA_TRUE;
if (mdata->surface && (mdata->surface != scaled))
ENFN->image_map_surface_free(ENDT, mdata->surface);
mdata->surface = scaled;
mdata->w = w;
mdata->h = h;

13
src/modules/evas/engines/gl_generic/evas_engine.c
View File

@ -959,6 +959,7 @@ eng_image_scaled_update(void *data EINA_UNUSED, void *scaled, void *image,
Evas_GL_Image *dst = scaled;
Evas_GL_Image *src = image;
Evas_Engine_GL_Context *gc;
Eina_Bool reffed = EINA_FALSE;
if (!src) return NULL;
@ -971,7 +972,15 @@ eng_image_scaled_update(void *data EINA_UNUSED, void *scaled, void *image,
(dst->scaled.w == dst_w) && (dst->scaled.h == dst_h))
return dst;
if (dst) evas_gl_common_image_free(dst);
if (dst)
{
if (dst->scaled.origin == src)
{
src->references++;
reffed = EINA_TRUE;
}
evas_gl_common_image_free(dst);
}
evas_gl_common_image_update(gc, src);
if (!src->tex)
{
@ -992,7 +1001,7 @@ eng_image_scaled_update(void *data EINA_UNUSED, void *scaled, void *image,
dst->tex->references++;
dst->tex_only = 1;
src->references++;
if (!reffed) src->references++;
dst->scaled.origin = src;
dst->scaled.w = dst_w;
dst->scaled.h = dst_h;