From 28b779f69804616756f4c032bf8404455c378f10 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Jan 2009 09:22:54 +0000 Subject: merges r21763 from trunk into ruby_1_9_1. * dir.c (join_path): use strlcat() to force link. * dir.c (glob_helper): no strcpy() is needed since len is known. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ dir.c | 14 ++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23e71b447..c6cb936ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jan 25 09:09:29 2009 Nobuyoshi Nakada + + * dir.c (join_path): use strlcat() to force link. + + * dir.c (glob_helper): no strcpy() is needed since len is known. + Sat Jan 24 08:22:35 2009 Nobuyoshi Nakada * lib/mkmf.rb (configuration): tools under the top source diff --git a/dir.c b/dir.c index ffc7e05c0..f5e8cf72e 100644 --- a/dir.c +++ b/dir.c @@ -1112,15 +1112,16 @@ static char * join_path(const char *path, int dirsep, const char *name) { long len = strlen(path); - char *buf = GLOB_ALLOC_N(char, len+strlen(name)+(dirsep?1:0)+1); + long len2 = strlen(name)+(dirsep?1:0)+1; + char *buf = GLOB_ALLOC_N(char, len+len2); if (!buf) return 0; memcpy(buf, path, len); if (dirsep) { - strcpy(buf+len, "/"); - len++; + buf[len++] = '/'; } - strcpy(buf+len, name); + buf[len] = '\0'; + strlcat(buf+len, name, len2); return buf; } @@ -1301,12 +1302,13 @@ glob_helper( if (*cur) { char *buf; char *name; - name = GLOB_ALLOC_N(char, strlen((*cur)->str) + 1); + size_t len = strlen((*cur)->str) + 1; + name = GLOB_ALLOC_N(char, len); if (!name) { status = -1; break; } - strcpy(name, (*cur)->str); + memcpy(name, (*cur)->str, len); if (escape) remove_backslashes(name, enc); new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg); -- cgit