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: env block size limit on Windows

Browse source 
* hash.c (ruby_setenv): do not check environment block size.
  c.f. https://msdn.microsoft.com/en-us/library/windows/desktop/ms682653(v=vs.85).aspx
  Starting with Windows Vista and Windows Server 2008, there is no
  technical limitation on the size of the environment block.
  [ruby-core:88400] [Bug #14979]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-08-11 13:18:55 +00:00
parent 3d2e7b6158
commit 490fbc4c85
2 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
hash.c
View file

@ -3549,10 +3549,33 @@ getenvsize(const WCHAR* p)
while (*p++) p += lstrlenW(p) + 1; while (*p++) p += lstrlenW(p) + 1;
return p - porg + 1; return p - porg + 1;
} }
static size_t static size_t
getenvblocksize(void) getenvblocksize(void)
{ {
#ifdef _MAX_ENV
return _MAX_ENV;
#else
return 32767; return 32767;
#endif
}
static int
check_envsize(size_t n)
{
if (_WIN32_WINNT < 0x0600 && rb_w32_osver() < 6) {
/* https://msdn.microsoft.com/en-us/library/windows/desktop/ms682653(v=vs.85).aspx */
/* Windows Server 2003 and Windows XP: The maximum size of the
* environment block for the process is 32,767 characters. */
WCHAR* p = GetEnvironmentStringsW();
if (!p) return -1; /* never happen */
n += getenvsize(p);
FreeEnvironmentStringsW(p);
if (n >= getenvblocksize()) {
return -1;
}
}
return 0;
} }
#endif #endif
@ -3592,16 +3615,11 @@ ruby_setenv(const char *name, const char *value)
check_envname(name); check_envname(name);
len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0); len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
if (value) { if (value) {
WCHAR* p = GetEnvironmentStringsW();
size_t n;
int len2; int len2;
if (!p) goto fail; /* never happen */ len2 = MultiByteToWideChar(CP_UTF8, 0, value, -1, NULL, 0);
n = lstrlen(name) + 2 + strlen(value) + getenvsize(p); if (check_envsize((size_t)len + len2)) { /* len and len2 include '\0' */
FreeEnvironmentStringsW(p);
if (n >= getenvblocksize()) {
goto fail; /* 2 for '=' & '\0' */ goto fail; /* 2 for '=' & '\0' */
} }
len2 = MultiByteToWideChar(CP_UTF8, 0, value, -1, NULL, 0);
wname = ALLOCV_N(WCHAR, buf, len + len2); wname = ALLOCV_N(WCHAR, buf, len + len2);
wvalue = wname + len; wvalue = wname + len;
MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, len); MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, len);

18
test/ruby/test_env.rb
View file

@ -457,7 +457,7 @@ class TestEnv < Test::Unit::TestCase
def test_huge_value def test_huge_value
huge_value = "bar" * 40960 huge_value = "bar" * 40960
ENV["foo"] = "bar" ENV["foo"] = "bar"
if /mswin|mingw/ =~ RUBY_PLATFORM if /mswin|mingw/ =~ RUBY_PLATFORM && windows_version < 6
assert_raise(Errno::EINVAL) { ENV["foo"] = huge_value } assert_raise(Errno::EINVAL) { ENV["foo"] = huge_value }
assert_equal("bar", ENV["foo"]) assert_equal("bar", ENV["foo"])
else else
@ -467,6 +467,10 @@ class TestEnv < Test::Unit::TestCase
end end
if /mswin|mingw/ =~ RUBY_PLATFORM if /mswin|mingw/ =~ RUBY_PLATFORM
def windows_version
@windows_version ||= %x[ver][/Version (\d+)/, 1].to_i
end
def test_win32_blocksize def test_win32_blocksize
keys = [] keys = []
len = 32767 - ENV.to_a.flatten.inject(1) {|r,e| r + e.bytesize + 1} len = 32767 - ENV.to_a.flatten.inject(1) {|r,e| r + e.bytesize + 1}
@ -476,9 +480,15 @@ class TestEnv < Test::Unit::TestCase
keys << key keys << key
ENV[key] = val ENV[key] = val
end end
1.upto(12) {|i| if windows_version < 6
assert_raise(Errno::EINVAL) { ENV[key] = val } 1.upto(12) {|i|
} assert_raise(Errno::EINVAL) { ENV[key] = val }
}
else
1.upto(12) {|i|
assert_nothing_raised(Errno::EINVAL) { ENV[key] = val }
}
end
ensure ensure
keys.each {|k| ENV.delete(k)} keys.each {|k| ENV.delete(k)}
end end