kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

hash.c: fix memory leak

Browse source 
* hash.c (ruby_setenv): fix memory leak on Windows, free
  environment strings block after check for the size.
  [ruby-dev:48323] [Bug #9977]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-06-25 13:31:34 +00:00
parent e1884ec820
commit 4198f1473a
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Jun 25 22:31:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (ruby_setenv): fix memory leak on Windows, free
environment strings block after check for the size.
[ruby-dev:48323] [Bug #9977]
Wed Jun 25 15:44:12 2014 Eric Wong <e@80x24.org>
* ccan/container_of/container_of.h (container_off_var):

7
hash.c
View file

@ -2750,9 +2750,12 @@ ruby_setenv(const char *name, const char *value)
int failed = 0;
check_envname(name);
if (value) {
const char* p = GetEnvironmentStringsA();
char* p = GetEnvironmentStringsA();
size_t n;
if (!p) goto fail; /* never happen */
if (strlen(name) + 2 + strlen(value) + getenvsize(p) >= getenvblocksize()) {
n = strlen(name) + 2 + strlen(value) + getenvsize(p);
FreeEnvironmentStringsA(p);
if (n >= getenvblocksize()) {
goto fail; /* 2 for '=' & '\0' */
}
buf = rb_sprintf("%s=%s", name, value);

10
test/ruby/test_env.rb
View file

@ -1,4 +1,5 @@
require 'test/unit'
require_relative 'envutil'
class TestEnv < Test::Unit::TestCase
IGNORE_CASE = /bccwin|mswin|mingw/ =~ RUBY_PLATFORM
@ -507,4 +508,13 @@ class TestEnv < Test::Unit::TestCase
end.call
end
end
def test_memory_leak_aset
bug9977 = '[ruby-dev:48323] [Bug #9977]'
assert_no_memory_leak([], <<-'end;', "5_000.times {ENV[k] = v}", bug9977)
ENV.clear
k = 'FOO'
v = (ENV[k] = 'bar'*5000 rescue 'bar'*1500)
end;
end
end