Permalink
Browse files

merge revision(s) 20103:

	* array.c (rb_ary_join): do not repeat self in a recursive array.
	  [ruby-dev:37019]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@22058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent efc34d6 commit 9d729c229adfa60b22b5fdda859ed480f86f15df @shyouhei shyouhei committed Feb 4, 2009
Showing with 10 additions and 5 deletions.
  1. +5 −0 ChangeLog
  2. +1 −1 array.c
  3. +4 −4 version.h
View
5 ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 5 08:55:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * array.c (rb_ary_join): do not repeat self in a recursive array.
+ [ruby-dev:37019]
+
Wed Feb 4 14:26:58 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (dir_globs): need taint check. reported by steve
View
2 array.c
@@ -1405,7 +1405,7 @@ rb_ary_join(ary, sep)
case T_STRING:
break;
case T_ARRAY:
- if (rb_inspecting_p(tmp)) {
+ if (tmp == ary || rb_inspecting_p(tmp)) {
tmp = rb_str_new2("[...]");
}
else {
View
8 version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-02-04"
+#define RUBY_RELEASE_DATE "2009-02-05"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090204
-#define RUBY_PATCHLEVEL 105
+#define RUBY_RELEASE_CODE 20090205
+#define RUBY_PATCHLEVEL 106
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];

0 comments on commit 9d729c2

Please sign in to comment.