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

dir.c: use NAMLEN

Browse source 
* dir.c (glob_helper): use NAMLEN() to tell the length of d_name
  instead of strlen(), which can access beyond the boundary.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-12-01 06:05:33 +00:00
parent 6e46c04850
commit 0f37c95134
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Dec 1 15:05:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (glob_helper): use NAMLEN() to tell the length of d_name
instead of strlen(), which can access beyond the boundary.
Sat Dec 1 13:48:13 2012 Eric Hodel <drbrain@segment7.net> Sat Dec 1 13:48:13 2012 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/specification.rb: Don't add default gems to $LOAD_PATH * lib/rubygems/specification.rb: Don't add default gems to $LOAD_PATH

25
dir.c
View file

@ -1132,10 +1132,9 @@ find_dirsep(const char *p, const char *pend, int flags, rb_encoding *enc)
} }
/* Remove escaping backslashes */ /* Remove escaping backslashes */
static void static char *
remove_backslashes(char *p, rb_encoding *enc) remove_backslashes(char *p, register const char *pend, rb_encoding *enc)
{ {
register const char *pend = p + strlen(p);
char *t = p; char *t = p;
char *s = p; char *s = p;
@ -1154,6 +1153,8 @@ remove_backslashes(char *p, rb_encoding *enc)
if (t != s) if (t != s)
memmove(t, s, p - s); /* move '\0' too */ memmove(t, s, p - s); /* move '\0' too */
return p;
} }
/* Globing pattern */ /* Globing pattern */
@ -1247,19 +1248,18 @@ glob_free_pattern(struct glob_pattern *list)
} }
static char * static char *
join_path(const char *path, int dirsep, const char *name) join_path(const char *path, int dirsep, const char *name, size_t namlen)
{ {
long len = strlen(path); long len = strlen(path);
long len2 = strlen(name)+(dirsep?1:0)+1; char *buf = GLOB_ALLOC_N(char, len+namlen+(dirsep?1:0)+1);
char *buf = GLOB_ALLOC_N(char, len+len2);
if (!buf) return 0; if (!buf) return 0;
memcpy(buf, path, len); memcpy(buf, path, len);
if (dirsep) { if (dirsep) {
buf[len++] = '/'; buf[len++] = '/';
} }
buf[len] = '\0'; memcpy(buf+len, name, namlen);
strlcat(buf+len, name, len2); buf[len+namlen] = '\0';
return buf; return buf;
} }
@ -1364,7 +1364,7 @@ glob_helper(
if (status) return status; if (status) return status;
} }
if (match_dir && isdir == YES) { if (match_dir && isdir == YES) {
char *tmp = join_path(path, dirsep, ""); char *tmp = join_path(path, dirsep, "", 0);
if (!tmp) return -1; if (!tmp) return -1;
status = glob_call_func(func, tmp, arg, enc); status = glob_call_func(func, tmp, arg, enc);
GLOB_FREE(tmp); GLOB_FREE(tmp);
@ -1394,7 +1394,7 @@ glob_helper(
if (dp->d_name[1] == '.' && !dp->d_name[2]) continue; if (dp->d_name[1] == '.' && !dp->d_name[2]) continue;
} }
buf = join_path(path, dirsep, dp->d_name); buf = join_path(path, dirsep, dp->d_name, NAMLEN(dp));
if (!buf) { if (!buf) {
status = -1; status = -1;
break; break;
@ -1458,7 +1458,8 @@ glob_helper(
break; break;
} }
memcpy(name, (*cur)->str, len); memcpy(name, (*cur)->str, len);
if (escape) remove_backslashes(name, enc); if (escape)
len = remove_backslashes(name, name+len-1, enc) - name;
new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg); new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
if (!new_beg) { if (!new_beg) {
@ -1474,7 +1475,7 @@ glob_helper(
} }
} }
buf = join_path(path, dirsep, name); buf = join_path(path, dirsep, name, len);
GLOB_FREE(name); GLOB_FREE(name);
if (!buf) { if (!buf) {
GLOB_FREE(new_beg); GLOB_FREE(new_beg);