backport rev. 76330

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/ecore-1.7@76331 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 936da47..10bee7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -888,6 +888,10 @@
 
         * Add Copy-N-Paste support for Ecore_Wayland.
 
+2012-08-30  Carsten Haitzler (The Rasterman)
+
+        1.7.0 release
+
 2012-09-05  Mike Blumenkrantz
 
        * Fix crash that could occur in ecore_con_ssl with privkeys and certificates on failure
@@ -901,3 +905,7 @@
 2012-09-07  Christopher Michael
 
        * Fix ecore_x_randr to actually return outputs properly.
+
+2012-09-08  Vincent Torri
+
+       * Fix readlink usage in ecore_file.

diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index fd06f7d..cc0be54 100644 (file)
--- a/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
@@ -404,7 +404,7 @@ ecore_file_recursive_rm(const char *dir)
    struct stat st;
    int ret;
 
-   if (readlink(dir, buf, sizeof(buf)) > 0)
+   if (readlink(dir, buf, sizeof(buf) - 1) > 0)
      return ecore_file_unlink(dir);
 
    ret = stat(dir, &st);