summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--hash.c5
-rw-r--r--test/ruby/test_env.rb9
3 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7aa6f8d1c3..659df9c954 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 27 05:33:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * hash.c (env_shift): fix memory leak on Windows, free environment
+ strings block always. [ruby-dev:48332] [Bug #9983]
+
Fri Jun 27 03:41:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (GETASTER): should not use the numbered argument to be
diff --git a/hash.c b/hash.c
index bcf6b5e54b..348e5fb976 100644
--- a/hash.c
+++ b/hash.c
@@ -3554,6 +3554,7 @@ static VALUE
env_shift(void)
{
char **env;
+ VALUE result = Qnil;
env = GET_ENVIRON(environ);
if (*env) {
@@ -3562,11 +3563,11 @@ env_shift(void)
VALUE key = env_str_new(*env, s-*env);
VALUE val = env_str_new2(getenv(RSTRING_PTR(key)));
env_delete(Qnil, key);
- return rb_assoc_new(key, val);
+ result = rb_assoc_new(key, val);
}
}
FREE_ENVIRON(environ);
- return Qnil;
+ return result;
}
/*
diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb
index 5eff01c5a2..820d9dcb3c 100644
--- a/test/ruby/test_env.rb
+++ b/test/ruby/test_env.rb
@@ -533,4 +533,13 @@ class TestEnv < Test::Unit::TestCase
ENV.select {ENV.clear}
end;
end
+
+ def test_memory_leak_shift
+ bug9983 = '[ruby-dev:48332] [Bug #9983]'
+ assert_no_memory_leak([], <<-'end;', "5_000.times {ENV.shift; ENV[k] = v}", bug9983)
+ ENV.clear
+ k = 'FOO'
+ v = (ENV[k] = 'bar'*5000 rescue 'bar'*1500)
+ end;
+ end
end