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 (ruby_setenv): calculate total env block size for win32.

Browse source 
* test/ruby/test_env.rb: add test for above patch.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
arton 2011-03-19 09:28:49 +00:00
parent 812550b977
commit 5281610f91
3 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Mar 19 18:35:05 2011 Tajima Akio <artonx@yahoo.co.jp>
* hash.c (ruby_setenv): calculate total env block size for win32.
* test/ruby/test_env.rb: add test for above patch.
Sat Mar 19 17:14:46 2011 Tajima Akio <artonx@yahoo.co.jp>
* hash.c (ruby_setenv): checking with max process environment

16
hash.c
View file

@ -2194,6 +2194,20 @@ envix(const char *nam)
}
#endif
#if defined(_WIN32)
static int
getenvsize(char* p)
{
char prev = *p++;
int len = 1;
for (; prev || *p; p++) {
prev = *p;
len++;
}
return len;
}
#endif
void
ruby_setenv(const char *name, const char *value)
{
@ -2208,7 +2222,7 @@ ruby_setenv(const char *name, const char *value)
if (value) {
char* p = GetEnvironmentStringsA();
if (p) {
if (strlen(value) + strlen(p) >= 32767) goto fail;
if (strlen(name) + 1 + strlen(value) + getenvsize(p) >= 32767) goto fail;
} else {
if (strlen(value) >= 5120) goto fail;
}

12
test/ruby/test_env.rb
View file

@ -387,4 +387,16 @@ class TestEnv < Test::Unit::TestCase
assert_equal(huge_value, ENV["foo"])
end
end
if /mswin|mingw/ =~ RUBY_PLATFORM
def test_win32_blocksize
len = 32767 - ENV.to_a.flatten.inject(0) {|r,e| r + e.size + 2 }
val = "bar" * 1000
key = nil
1.upto(12) {|i|
ENV[key] = val while (len -= val.size + (key="foo#{len}").size + 2) > 0
assert_raise(Errno::EINVAL) { ENV[key] = val }
}
end
end
end