diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 48f1c66e3a..b9f6303949 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-08  Vincent Torri  <doursse at users dot sf dot net>
+
+	* src/lib/evil_stdlib.c:
+	manage correctly getenv() when value is NULL.
+
 2009-02-22  Vincent Torri  <doursse at users dot sf dot net>
 
 	* src/lib/evil_main.c:
diff --git a/legacy/evil/src/lib/evil_stdlib.c b/legacy/evil/src/lib/evil_stdlib.c
index 6c6ef64783..8015882726 100644
--- a/legacy/evil/src/lib/evil_stdlib.c
+++ b/legacy/evil/src/lib/evil_stdlib.c
@@ -152,7 +152,8 @@ setenv(const char *name,
    if (!overwrite && old_name)
      return 0;
 
-   length = strlen(name) + strlen(value) + 2;
+   length = value ? strlen(value) : 0;
+   length += strlen(name) + 2;
    str = (char *)malloc(length);
    if (!str)
      {