From fea2ebff1a148f9dc9a6b2e9f149958a968c2f9f Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 29 Apr 2009 06:22:29 +0000 Subject: * 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 --- file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index 40bf0267af..4b67b02171 100644 --- a/file.c +++ b/file.c @@ -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; -- cgit v1.2.3