diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-19 08:31:04 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-19 08:31:04 +0000 |
commit | b598fbb3ec1afec26a352f88c894cc44067e4b2a (patch) | |
tree | ffade6e5d1945bcecdd7236487b5f94a59b501a6 /hash.c | |
parent | 5b62f128215e1616eae5e1b3f194877dc8470054 (diff) | |
download | ruby-b598fbb3ec1afec26a352f88c894cc44067e4b2a.tar.gz ruby-b598fbb3ec1afec26a352f88c894cc44067e4b2a.tar.xz ruby-b598fbb3ec1afec26a352f88c894cc44067e4b2a.zip |
* signal.c (trap): remove sigexit(); handle "EXIT" via sig_exec().
[ruby-dev:26440]
* io.c (rb_io_inspect): replace sprintf() with "%s" format all
over the place by snprintf() to avoid integer overflow.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r-- | hash.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1809,7 +1809,7 @@ ruby_setenv(name, value) else unsetenv(name); #else /* WIN32 */ - + size_t len; int i=envix(name); /* where does it go? */ if (environ == origenviron) { /* need we copy environment? */ @@ -1842,9 +1842,10 @@ ruby_setenv(name, value) REALLOC_N(environ, char*, i+2); /* just expand it a bit */ environ[i+1] = 0; /* make sure it's null terminated */ } - environ[i] = ALLOC_N(char, strlen(name) + strlen(value) + 2); + len = strlen(name) + strlen(value) + 2; + environ[i] = ALLOC_N(char, len); #ifndef MSDOS - sprintf(environ[i],"%s=%s",name,value); /* all that work just for this */ + snprintf(environ[i],len,"%s=%s",name,value); /* all that work just for this */ #else /* MS-DOS requires environment variable names to be in uppercase */ /* [Tom Dinger, 27 August 1990: Well, it doesn't _require_ it, but |