diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-26 20:33:34 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-26 20:33:34 +0000 |
commit | 68bc5ba1b6695f80623441cb60436801add42757 (patch) | |
tree | 3d4590136e772f6888243551124fc2168a0d9f9b | |
parent | cfa7b2283b9b53ff8689d510d486f3488d9254d1 (diff) | |
download | ruby-68bc5ba1b6695f80623441cb60436801add42757.tar.gz |
hash.c: fix memory leak
* hash.c (env_shift): fix memory leak on Windows, free environment
strings block always. [ruby-dev:48332] [Bug #9983]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | hash.c | 5 | ||||
-rw-r--r-- | test/ruby/test_env.rb | 9 |
3 files changed, 17 insertions, 2 deletions
@@ -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 @@ -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 |