1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hash.c: fix memory leak

Browse Source 
* hash.c (env_select): fix memory leak and crash on Windows, make
  keys array first instead of iterating on envrion directly.
  [ruby-dev:48325] [Bug #9978]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-06-25 23:28:04 +00:00
parent 7eeaf208b4
commit 78c763a25c
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Jun 26 08:28:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (env_select): fix memory leak and crash on Windows, make
keys array first instead of iterating on envrion directly.
[ruby-dev:48325] [Bug #9978]
Thu Jun 26 02:45:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jun 26 02:45:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval_error.c (error_print): put a newline after an anonymous * eval_error.c (error_print): put a newline after an anonymous

20
hash.c
View File

@ -3138,23 +3138,21 @@ static VALUE
env_select(VALUE ehash) env_select(VALUE ehash)
{ {
VALUE result; VALUE result;
char **env; VALUE keys;
long i;
RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size); RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
result = rb_hash_new(); result = rb_hash_new();
env = GET_ENVIRON(environ); keys = env_keys();
while (*env) { for (i = 0; i < RARRAY_LEN(keys); ++i) {
char *s = strchr(*env, '='); VALUE key = RARRAY_AREF(keys, i);
if (s) { VALUE val = rb_f_getenv(Qnil, key);
VALUE k = env_str_new(*env, s-*env); if (!NIL_P(val)) {
VALUE v = env_str_new2(s+1); if (RTEST(rb_yield_values(2, key, val))) {
if (RTEST(rb_yield_values(2, k, v))) { rb_hash_aset(result, key, val);
rb_hash_aset(result, k, v);
} }
} }
env++;
} }
FREE_ENVIRON(environ);
return result; return result;
} }

16
test/ruby/test_env.rb
View File

@ -517,4 +517,20 @@ class TestEnv < Test::Unit::TestCase
v = (ENV[k] = 'bar'*5000 rescue 'bar'*1500) v = (ENV[k] = 'bar'*5000 rescue 'bar'*1500)
end; end;
end end
def test_memory_leak_select
bug9978 = '[ruby-dev:48325] [Bug #9978]'
assert_no_memory_leak([], <<-'end;', "5_000.times {ENV.select {break}}", bug9978)
ENV.clear
k = 'FOO'
(ENV[k] = 'bar'*5000 rescue 'bar'*1500)
end;
end
def test_memory_crash_select
assert_normal_exit(<<-'end;')
1000.times {ENV["FOO#{i}"] = 'bar'}
ENV.select {ENV.clear}
end;
end
end end