diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | hash.c | 22 | ||||
| -rw-r--r-- | include/ruby/win32.h | 1 | ||||
| -rw-r--r-- | win32/win32.c | 2 |
4 files changed, 22 insertions, 11 deletions
@@ -1,3 +1,9 @@ +Sun Mar 20 01:39:48 2011 Tajima Akio <artonx@yahoo.co.jp> + + * hash.c (ruby_setenv): check env process block size with OS ver. + * win32/win32.c: export rb_w32_osver for above patch. + * include/ruby/win32.h: declare rb_w32_osver for Win32 Libs. + Sat Mar 19 18:35:05 2011 Tajima Akio <artonx@yahoo.co.jp> * hash.c (ruby_setenv): calculate total env block size for win32. @@ -6,7 +12,7 @@ Sat Mar 19 18:35:05 2011 Tajima Akio <artonx@yahoo.co.jp> Sat Mar 19 17:14:46 2011 Tajima Akio <artonx@yahoo.co.jp> * hash.c (ruby_setenv): checking with max process environment - block size fow Win32. 32767 for 2000/XP, 2003. if failed to + block size for Win32. 32767 for 2000/XP, 2003. if failed to read the block, then checking with 5120 for earlier Windows. Sat Mar 19 12:30:25 2011 Tanaka Akira <akr@fsij.org> @@ -2195,13 +2195,18 @@ envix(const char *nam) #endif #if defined(_WIN32) -static int -getenvsize(char* p) +static size_t +getenvsize(const char* p) { - char* porg = p; - while (*p || *(p + 1)) ++p; + const char* porg = p; + while (*p++) p += strlen(p) + 1; return p - porg + 1; } +static size_t +getenvblocksize() +{ + return (rb_w32_osver() >= 5) ? 32767 : 5120; +} #endif void @@ -2216,11 +2221,10 @@ ruby_setenv(const char *name, const char *value) rb_sys_fail("ruby_setenv"); } if (value) { - char* p = GetEnvironmentStringsA(); - if (p) { - if (strlen(name) + 1 + strlen(value) + getenvsize(p) >= 32767) goto fail; - } else { - if (strlen(value) >= 5120) goto fail; + const char* p = GetEnvironmentStringsA(); + if (!p) goto fail; /* never happen */ + if (strlen(name) + 2 + strlen(value) + getenvsize(p) >= getenvblocksize()) { + goto fail; /* 2 for '=' & '\0' */ } buf = rb_sprintf("%s=%s", name, value); } diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 051e9e9814..791085fa6c 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -271,6 +271,7 @@ extern char **rb_w32_get_environ(void); extern void rb_w32_free_environ(char **); extern int rb_w32_map_errno(DWORD); extern char * WSAAPI rb_w32_inet_ntop(int,void *,char *,size_t); +extern DWORD rb_w32_osver(void); extern int chown(const char *, int, int); extern int rb_w32_uchown(const char *, int, int); diff --git a/win32/win32.c b/win32/win32.c index 99802d07d0..1805fe1015 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -252,7 +252,7 @@ rb_w32_osid(void) } #endif -static DWORD +DWORD rb_w32_osver(void) { return osver.dwMajorVersion; |