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

efl: fix potential segv in Evas software engine native_set code. 

SVN revision: 80805
This commit is contained in:
Cedric BAIL 2012-12-13 09:46:32 +00:00
parent 5828c04123
commit b8ffd432b1
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2012-12-13 Cedric Bail
* Fix potential segv in software engine native_set code.
2012-12-12 Daniel Willmann
* Fix possible buffer overflow in functions relying on EET_T_LAST.

1
NEWS
View File

@ -78,3 +78,4 @@ Fixes:
* Fix the gl line incorrect position drawing.
* Fix possible buffer overflow in functions relying on EET_T_LAST
* Fix possible memory corruption in xrandr EDID functions.
* Fix potential segv in software engine native_set code.

16
src/modules/evas/engines/software_generic/evas_engine.c
View File

@ -578,21 +578,7 @@ eng_image_native_set(void *data EINA_UNUSED, void *image, void *native EINA_UNUS
Evas_Native_Surface *ns = native;
Image_Entry *im = image, *im2 = NULL;
if (!im)
{
if ((ns) && (ns->data.x11.visual))
{
im = evas_cache_image_data(evas_common_image_cache_get(),
im->w, im->h,
ns->data.x11.visual, 1,
EVAS_COLORSPACE_ARGB8888);
return im;
}
else
return NULL;
}
if ((!ns) && (!im)) return im;
if (!im || !ns) return im;
if (!ns) return im;