[oe-commits] Thomas Zimmermann : efreet: fix segfault

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 451d5740d89582a7129f8f59ec1685c02f851cba
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=451d5740d89582a7129f8f59ec1685c02f851cba

Author: Thomas Zimmermann <ml at vdm-design.de>
Date:   Mon Feb 28 21:44:02 2011 +0100

efreet: fix segfault

* when installing a new .desktop file on the desktop e segfaults
  if there is a file without . in that dir
* this fixes SHR bug #1295

Signed-off-by: Thomas Zimmermann <ml at vdm-design.de>

---

 recipes/efl1/efreet/changeset_trunk_r57435.patch |   11 +++++++++++
 recipes/efl1/efreet_1.0.0.bb                     |    3 ++-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/recipes/efl1/efreet/changeset_trunk_r57435.patch b/recipes/efl1/efreet/changeset_trunk_r57435.patch
new file mode 100644
index 0000000..f652af2
--- /dev/null
+++ b/recipes/efl1/efreet/changeset_trunk_r57435.patch
@@ -0,0 +1,11 @@
+Index: efreet/src/lib/efreet_desktop.c
+===================================================================
+--- efreet/src/lib/efreet_desktop.c	(revision 57257)
++++ efreet/src/lib/efreet_desktop.c	(revision 57435)
+@@ -1206,5 +1206,5 @@
+         case ECORE_FILE_EVENT_MODIFIED:
+             ext = strrchr(path, '.');
+-            if (!strcmp(ext, ".desktop") || !strcmp(ext, ".directory"))
++            if (ext && (!strcmp(ext, ".desktop") || !strcmp(ext, ".directory")))
+                 efreet_cache_desktop_update();
+             break;
diff --git a/recipes/efl1/efreet_1.0.0.bb b/recipes/efl1/efreet_1.0.0.bb
index dd50c62..d2d7f2f 100644
--- a/recipes/efl1/efreet_1.0.0.bb
+++ b/recipes/efl1/efreet_1.0.0.bb
@@ -1,9 +1,10 @@
 require efreet.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
+  file://changeset_trunk_r57435.patch \
 "
 
 SRC_URI[md5sum] = "ce7dd05138335312c7eb9ac8e5e62467"