diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 58bacac6d5..a23aaa8440 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-18  Vincent Torri  <doursse at users dot sf dot net>
+
+	* src/lib/libgen.c:
+	fix segmentation fault in basename() and dirname()
+
 2010-12-18  Vincent Torri  <doursse at users dot sf dot net>
 
 	* src/lib/Evil.h:
diff --git a/legacy/evil/src/lib/evil_libgen.c b/legacy/evil/src/lib/evil_libgen.c
index 089bdb5f8f..3913050237 100644
--- a/legacy/evil/src/lib/evil_libgen.c
+++ b/legacy/evil/src/lib/evil_libgen.c
@@ -36,7 +36,7 @@ evil_basename(char *path)
         return _evil_basename_buf;
      }
    p2 = p1;
-   while (p2)
+   while (*p2)
      {
         if (*p2 == '/') *p2 = '\\';
         p2++;
@@ -86,7 +86,7 @@ evil_dirname(char *path)
         return _evil_dirname_buf;
      }
    p2 = p1;
-   while (p2)
+   while (*p2)
      {
         if (*p2 == '/') *p2 = '\\';
         p2++;