[PATCH] ecore-svn: fix NULL pointer dereference

[PATCH] ecore-svn: fix NULL pointer dereference

[Petr Štetiar]

This patch fixes NULL pointer dereference in exquisite triggered 5 times
during each boot and causes flood of this annoying messages:

*** ECORE ERROR: Ecore Magic Check Failed!!!
*** IN FUNCTION: ecore_event_handler_del() Input handle pointer is NULL!
*** NAUGHTY PROGRAMMER!!!
*** SPANK SPANK SPANK!!!
*** Now go fix your code. Tut tut tut!

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
 recipes/efl1/ecore/fix-null-pointer.patch |   29 +++++++++++++++++++++++++++++
 recipes/efl1/ecore_svn.bb                 |    3 ++-
 2 files changed, 31 insertions(+), 1 deletions(-)
 create mode 100644 recipes/efl1/ecore/fix-null-pointer.patch

diff --git a/recipes/efl1/ecore/fix-null-pointer.patch b/recipes/efl1/ecore/fix-null-pointer.patch
new file mode 100644
index 0000000..4750e4d
--- /dev/null
+++ b/recipes/efl1/ecore/fix-null-pointer.patch
@@ -0,0 +1,29 @@
+This patch fixes NULL pointer dereference in exquisite triggered 5 times
+during each boot and causes flood of this annoying messages:
+
+*** ECORE ERROR: Ecore Magic Check Failed!!!
+*** IN FUNCTION: ecore_event_handler_del() Input handle pointer is NULL!
+*** NAUGHTY PROGRAMMER!!!
+*** SPANK SPANK SPANK!!!
+*** Now go fix your code. Tut tut tut!
+
+Signed-off-by: Petr Stetiar <ynezz@true.cz>
+
+Index: ecore/src/lib/ecore_evas/ecore_evas_fb.c
+===================================================================
+--- ecore.orig/src/lib/ecore_evas/ecore_evas_fb.c	2010-01-28 18:41:29.000000000 +0100
++++ ecore/src/lib/ecore_evas/ecore_evas_fb.c	2010-01-28 18:42:53.000000000 +0100
+@@ -504,8 +504,11 @@
+      {
+ 	int i;
+ 
+-	for (i = 0; i < 5; i++)
+-	  ecore_event_handler_del(ecore_evas_event_handlers[i]);
++	for (i = 0; i < 5; i++) {
++	  if (ecore_evas_event_handlers[i]) {
++	  	ecore_event_handler_del(ecore_evas_event_handlers[i]);
++	  }
++	}
+ 	ecore_fb_ts_shutdown();
+      }
+    if (_ecore_evas_init_count < 0) _ecore_evas_init_count = 0;
diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb
index 178e9e9..0f15184 100644
--- a/recipes/efl1/ecore_svn.bb
+++ b/recipes/efl1/ecore_svn.bb
@@ -1,8 +1,9 @@
 require ecore.inc
-PR = "r7"
+PR = "r8"
 
 SRC_URI += "file://iconv.patch;patch=1;maxrev=43996 \
             file://exit_uclibc.patch;patch=1 \
+            file://fix-null-pointer.patch;patch=1 \
            "
 
 EXTRA_OECONF = "\
-- 
1.6.0.4

Re: [PATCH] ecore-svn: fix NULL pointer dereference

[Petr Štetiar]

Petr Štetiar <ynezz@true.cz> [2010-01-28 21:52:44]:

> This patch fixes NULL pointer dereference in exquisite triggered 5 times
> during each boot and causes flood of this annoying messages:

Ok, got in touch with developers, so it's fixed upstream[1]. Sorry for the
noise.

-- ynezz

1. http://trac.enlightenment.org/e/changeset/45673