From a164f6bab9690993ff2a3adc49e6906e8c143577 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 14 Aug 2010 08:12:05 +0000 Subject: merges r28795 and r28796 from trunk into ruby_1_9_2. -- * file.c (file_expand_path): should check if could find user. [ruby-core:31538] -- * file.c (file_expand_path): home directory must be absolute. [ruby-core:31537] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- file.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index 7c5367ff3a..0f1e24ba2e 100644 --- a/file.c +++ b/file.c @@ -2851,6 +2851,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) tainted = OBJ_TAINTED(fname); if (s[0] == '~' && abs_mode == 0) { /* execute only if NOT absolute_path() */ + long userlen = 0; tainted = 1; if (isdirsep(s[1]) || s[1] == '\0') { buf = 0; @@ -2859,13 +2860,24 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) } else { s = nextdirsep(b = s); - BUFCHECK(bdiff + (s-b) >= buflen); - memcpy(p, b, s-b); - rb_str_set_len(result, s-b); + userlen = s - b; + BUFCHECK(bdiff + userlen >= buflen); + memcpy(p, b, userlen); + rb_str_set_len(result, userlen); buf = p + 1; - p += s-b; + p += userlen; + } + if (NIL_P(rb_home_dir(buf, result))) { + rb_raise(rb_eArgError, "can't find user %s", buf); + } + if (!rb_is_absolute_path(RSTRING_PTR(result))) { + if (userlen) { + rb_raise(rb_eArgError, "non-absolute home of %.*s", (int)userlen, b); + } + else { + rb_raise(rb_eArgError, "non-absolute home"); + } } - rb_home_dir(buf, result); BUFINIT(); p = pend; } -- cgit v1.2.3