From c24562fb52c1fb20179a6de871b386ade9f2dba1 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Wed, 13 Jun 2012 08:20:28 +0000 Subject: [PATCH] fix crash when adding an image to an engineless canvas git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@72071 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 5 +++++ src/lib/canvas/evas_object_image.c | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 43a64de..3949dec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -800,3 +800,8 @@ 2012-06-12 ChunEon Park (Hermet) * Removed empty evas_object_map_source_set/get APIs. Will Not be implemented. + +2012-06-13 Mike Blumenkrantz + + * Fix crash in evas_object_image_add() when called prior to setting an engine + for the given canvas. diff --git a/src/lib/canvas/evas_object_image.c b/src/lib/canvas/evas_object_image.c index 14bde10..aa7efd8 100644 --- a/src/lib/canvas/evas_object_image.c +++ b/src/lib/canvas/evas_object_image.c @@ -177,6 +177,7 @@ evas_object_image_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); + EINA_SAFETY_ON_NULL_RETURN_VAL(e->engine.func, NULL); obj = evas_object_new(e); evas_object_image_init(obj); evas_object_inject(obj, e); -- 2.7.4