* hash.c (ruby_setenv): readline library leaves their environment

  strings uncopied.  "free" check revised.

* st.c (numhash): should shuffle bits by dividing by prime number.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 2 deletions

diff --git a/hash.c b/hash.c
index 1b007526da..43c1526a14 100644
--- a/hash.c
+++ b/hash.c
@@ -1063,8 +1063,12 @@ ruby_setenv(name, value)
 	environ = tmpenv;		/* tell exec where it is now */
     }
     if (!value) {
-	if (environ[i] != origenviron[i])
-	    free(environ[i]);
+	if (environ != origenviron) {
+	    char **envp = origenviron;
+	    while (*envp && *envp != environ[i]) envp++;
+	    if (!*envp)
+		free(environ[i]);
+	}
 	while (environ[i]) {
 	    environ[i] = environ[i+1];
 	    i++;