naruse	2012-01-05 12:18:18 +0900 (Thu, 05 Jan 2012)

  New Revision: 34215

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34215

  Log:
    * file.c (rb_file_join): separator is appended by array length - 1
      times. patched by Benoit Daloze [ruby-core:41901] [Bug #5841]

  Modified files:
    trunk/ChangeLog
    trunk/file.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34214)
+++ ChangeLog	(revision 34215)
@@ -1,3 +1,8 @@
+Thu Jan  5 12:15:55 2012  NARUSE, Yui  <naruse@r...>
+
+	* file.c (rb_file_join): separator is appended by array length - 1
+	  times. patched by Benoit Daloze [ruby-core:41901] [Bug #5841]
+
 Thu Jan  5 11:47:54 2012  NARUSE, Yui  <naruse@r...>
 
 	* lib/uri/common.rb (URI::Parser#initialize_regexp):
Index: file.c
===================================================================
--- file.c	(revision 34214)
+++ file.c	(revision 34215)
@@ -3825,7 +3825,7 @@
     }
     if (!NIL_P(sep)) {
 	StringValue(sep);
-	len += RSTRING_LEN(sep) * RARRAY_LEN(ary) - 1;
+	len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
     }
     result = rb_str_buf_new(len);
     OBJ_INFECT(result, ary);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/