enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

Evas masking: Make sure to check alloc before freeing old image 

Okay, I'm being paranoid and this can't possibly happen (calloc
fail? yeaaaah) but this makes sure we don't return NULL after
freeing the original image.
This commit is contained in:
Jean-Philippe Andre 2015-08-31 16:46:19 +09:00
parent b7ce5d9c47
commit b6abbf1277
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1229,7 +1229,7 @@ eng_image_scaled_update(void *data EINA_UNUSED, void *scaled, void *image,
Eina_Bool smooth, Eina_Bool alpha,
Evas_Colorspace cspace EINA_UNUSED)
{
Evas_GL_Image *dst = scaled;
Evas_GL_Image *dst = scaled, *newdst;
Evas_GL_Image *src = image;
Evas_Engine_GL_Context *gc;
Eina_Bool reffed = EINA_FALSE;
@ -1266,6 +1266,9 @@ eng_image_scaled_update(void *data EINA_UNUSED, void *scaled, void *image,
return NULL;
}
newdst = calloc(1, sizeof(Evas_GL_Image));
if (!newdst) return NULL;
if (dst)
{
if (dst->scaled.origin == src)
@ -1283,24 +1286,21 @@ eng_image_scaled_update(void *data EINA_UNUSED, void *scaled, void *image,
evas_gl_common_image_free(dst);
}
dst = calloc(1, sizeof(Evas_GL_Image));
if (!dst) return NULL;
dst->references = 1;
dst->gc = gc;
dst->cs.space = src->cs.space;
dst->alpha = alpha;
dst->w = dst_w;
dst->h = dst_h;
dst->tex = src->tex;
dst->tex->references++;
dst->tex_only = 1;
newdst->references = 1;
newdst->gc = gc;
newdst->cs.space = src->cs.space;
newdst->alpha = alpha;
newdst->w = dst_w;
newdst->h = dst_h;
newdst->tex = src->tex;
newdst->tex->references++;
newdst->tex_only = 1;
if (!reffed) src->references++;
dst->scaled.origin = src;
dst->scaled.smooth = smooth;
newdst->scaled.origin = src;
newdst->scaled.smooth = smooth;
return dst;
return newdst;
}
static void