summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c16
3 files changed, 6 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 74a6b658fb..d1ba56fb58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-12-13 Cedric Bail
2
3 * Fix potential segv in software engine native_set code.
4
12012-12-12 Daniel Willmann 52012-12-12 Daniel Willmann
2 6
3 * Fix possible buffer overflow in functions relying on EET_T_LAST. 7 * Fix possible buffer overflow in functions relying on EET_T_LAST.
diff --git a/NEWS b/NEWS
index 9de63b6e7b..7d45502c13 100644
--- a/NEWS
+++ b/NEWS
@@ -78,3 +78,4 @@ Fixes:
78 * Fix the gl line incorrect position drawing. 78 * Fix the gl line incorrect position drawing.
79 * Fix possible buffer overflow in functions relying on EET_T_LAST 79 * Fix possible buffer overflow in functions relying on EET_T_LAST
80 * Fix possible memory corruption in xrandr EDID functions. 80 * Fix possible memory corruption in xrandr EDID functions.
81 * Fix potential segv in software engine native_set code.
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 6dd22018da..9efd35efcf 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -578,21 +578,7 @@ eng_image_native_set(void *data EINA_UNUSED, void *image, void *native EINA_UNUS
578 Evas_Native_Surface *ns = native; 578 Evas_Native_Surface *ns = native;
579 Image_Entry *im = image, *im2 = NULL; 579 Image_Entry *im = image, *im2 = NULL;
580 580
581 if (!im) 581 if (!im || !ns) return im;
582 {
583 if ((ns) && (ns->data.x11.visual))
584 {
585 im = evas_cache_image_data(evas_common_image_cache_get(),
586 im->w, im->h,
587 ns->data.x11.visual, 1,
588 EVAS_COLORSPACE_ARGB8888);
589 return im;
590 }
591 else
592 return NULL;
593 }
594
595 if ((!ns) && (!im)) return im;
596 582
597 if (!ns) return im; 583 if (!ns) return im;
598 584