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

* win32/win32.c (rb_w32_cmdvector): fixed buffer size. reported by

Browse source 
wanabe [ruby-dev:30672]

	* win32/win32.c (init_env, insert, rb_w32_get_environ): use strdup
	  instead of malloc + strlcpy. suggested by nobu [ruby-dev:30673]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-03-30 02:50:58 +00:00
parent a2dba5be2d
commit 528e8517b8
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Fri Mar 30 11:46:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_cmdvector): fixed buffer size. reported by
wanabe [ruby-dev:30672]
* win32/win32.c (init_env, insert, rb_w32_get_environ): use strdup
instead of malloc + strlcpy. suggested by nobu [ruby-dev:30673]
Fri Mar 30 02:29:04 2007 Technorama <oss-ruby@technorama.net> Fri Mar 30 02:29:04 2007 Technorama <oss-ruby@technorama.net>
* ext/openssl/ossl_{bn,cipher,digest,hmac,rand,pkey_{dh,dsa,rsa}}.c: * ext/openssl/ossl_{bn,cipher,digest,hmac,rand,pkey_{dh,dsa,rsa}}.c:

15
win32/win32.c
View file

@ -401,10 +401,7 @@ init_env(void)
NTLoginName = "<Unknown>"; NTLoginName = "<Unknown>";
return; return;
} }
NTLoginName = (char *)malloc(len+1); NTLoginName = strdup(env);
if (!NTLoginName) return;
strlcpy(NTLoginName, env, len + 1);
NTLoginName[len] = '\0';
} }
static void init_stdhandle(void); static void init_stdhandle(void);
@ -1056,10 +1053,9 @@ insert(const char *path, VALUE vinfo)
if (!tmpcurr) return -1; if (!tmpcurr) return -1;
MEMZERO(tmpcurr, NtCmdLineElement, 1); MEMZERO(tmpcurr, NtCmdLineElement, 1);
tmpcurr->len = strlen(path); tmpcurr->len = strlen(path);
tmpcurr->str = (char *)malloc(tmpcurr->len + 1); tmpcurr->str = strdup(path);
if (!tmpcurr->str) return -1; if (!tmpcurr->str) return -1;
tmpcurr->flags |= NTMALLOC; tmpcurr->flags |= NTMALLOC;
strlcpy(tmpcurr->str, path, tmpcurr->len + 1);
**tail = tmpcurr; **tail = tmpcurr;
*tail = &tmpcurr->next; *tail = &tmpcurr->next;
@ -1373,7 +1369,7 @@ rb_w32_cmdvector(const char *cmd, char ***vec)
ptr = buffer + (elements+1) * sizeof(char *); ptr = buffer + (elements+1) * sizeof(char *);
while (curr = cmdhead) { while (curr = cmdhead) {
strlcpy(ptr, curr->str, len - (elements + 1)); strlcpy(ptr, curr->str, curr->len + 1);
*vptr++ = ptr; *vptr++ = ptr;
ptr += curr->len + 1; ptr += curr->len + 1;
cmdhead = curr->next; cmdhead = curr->next;
@ -1861,7 +1857,7 @@ rb_w32_strerror(int e)
e = GetLastError(); e = GetLastError();
if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, &source, e, 0, FORMAT_MESSAGE_IGNORE_INSERTS, &source, e, 0,
buffer, 512, NULL) == 0) buffer, sizeof(buffer), NULL) == 0)
strlcpy(buffer, "Unknown Error", sizeof(buffer)); strlcpy(buffer, "Unknown Error", sizeof(buffer));
} }
else else
@ -3916,10 +3912,9 @@ rb_w32_get_environ(void)
for (env = envtop, myenv = myenvtop; *env; env += strlen(env) + 1) { for (env = envtop, myenv = myenvtop; *env; env += strlen(env) + 1) {
if (*env != '=') { if (*env != '=') {
int len = strlen(env) + 1; int len = strlen(env) + 1;
if (!(*myenv = (char *)malloc(len))) { if (!(*myenv = strdup(env))) {
break; break;
} }
strlcpy(*myenv, env, len);
myenv++; myenv++;
} }
} }