diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-29 06:22:29 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-29 06:22:29 +0000 |
commit | fea2ebff1a148f9dc9a6b2e9f149958a968c2f9f (patch) | |
tree | eac7096f5038776479da6f8e53a66b42c3d11131 /file.c | |
parent | f4f3096dd3304d1d4b5e717becc7c15e01d08f19 (diff) |
* file.c (rb_file_join): recursive array has no meaning as path
name. [ruby-core:23329]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -3298,7 +3298,7 @@ static VALUE file_inspect_join(VALUE ary, VALUE argp, int recur) { VALUE *arg = (VALUE *)argp; - if (recur) return rb_usascii_str_new2("[...]"); + if (recur || ary == arg[0]) rb_raise(rb_eArgError, "recursive array"); return rb_file_join(arg[0], arg[1]); } @@ -3332,7 +3332,10 @@ rb_file_join(VALUE ary, VALUE sep) case T_STRING: break; case T_ARRAY: - { + if (ary == tmp) { + rb_raise(rb_eArgError, "recursive array"); + } + else { VALUE args[2]; args[0] = tmp; |