From 35b8b8fbf59443e247001758f598e55871ebaa14 Mon Sep 17 00:00:00 2001
From: Jiyoun Park <jy0703.park@samsung.com>
Date: Sat, 11 May 2013 22:40:50 +0900
Subject: [PATCH] * Evas: Fix crash if app use native surface in wrong engine.
 in sw engine, visual cannot be the image data.

---
 ChangeLog                                               | 4 ++++
 NEWS                                                    | 2 ++
 src/modules/evas/engines/software_generic/evas_engine.c | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a5ced2c454..c13c6100f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-11  Jiyou Park
+
+        * Evas: Fix crash if app use native surface in wrong engine.
+
 2013-05-10  Tom Hacohen
 
         * Evas text: Fixed line size calculation when using multiple
diff --git a/NEWS b/NEWS
index 0d45ad439e..04cc783577 100644
--- a/NEWS
+++ b/NEWS
@@ -266,3 +266,5 @@ Fixes:
     * Edje: fix custom states for proxy parts
     * Evas: Don't try blend on gl backened if the render option is COPY
     * Evas text: Fixed line size calculation when using multiple fonts.
+    * Evas: Fix crash if app use native surface in wrong engine.
+
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 3e36dd0dee..636e11b81c 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -922,7 +922,7 @@ eng_image_native_set(void *data EINA_UNUSED, void *image, void *native)
 
    im2 = evas_cache_image_data(evas_common_image_cache_get(), 
                                im->w, im->h, 
-                               ns->data.x11.visual, 1,
+                               NULL, 1,
                                EVAS_COLORSPACE_ARGB8888);
    if (im->references > 1)
      ERR("Setting native with more than one references for im=%p", im);