diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | hash.c | 16 | ||||
-rw-r--r-- | test/ruby/test_env.rb | 12 |
3 files changed, 32 insertions, 1 deletions
@@ -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 @@ -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; } diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb index 681b21d614..b987a4bac0 100644 --- a/test/ruby/test_env.rb +++ b/test/ruby/test_env.rb @@ -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 |