merge revision(s) 23306:

	* 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/branches/ruby_1_8_7@24114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/file.c b/file.c
index 72700a6a10..acb6a548b9 100644
--- a/file.c
+++ b/file.c
@@ -3124,8 +3124,8 @@ rb_file_join(ary, sep)
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
-		tmp = rb_str_new2("[...]");
+	    if (tmp == ary || rb_inspecting_p(tmp)) {
+		rb_raise(rb_eArgError, "recursive array");
 	    }
 	    else {
 		VALUE args[2];