From a2a9858b98e2726a28ff96fba4e3501d2268955b Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 3 Nov 2008 18:28:34 +0000 Subject: * array.c (rb_ary_join): do not repeat self in a recursive array. [ruby-dev:37019] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ array.c | 2 +- version.h | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc4b8d5001..2d99859d64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 4 03:28:31 2008 Nobuyoshi Nakada + + * array.c (rb_ary_join): do not repeat self in a recursive array. + [ruby-dev:37019] + Mon Nov 3 16:32:54 2008 Nobuyoshi Nakada * missing.h: needs RUBY_EXTERN instead of extern for mswin. diff --git a/array.c b/array.c index 5e2ed4db92..d063b06bd6 100644 --- a/array.c +++ b/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 { diff --git a/version.h b/version.h index a8ae1f48ed..052685cb08 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2008-11-03" +#define RUBY_RELEASE_DATE "2008-11-04" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20081103 +#define RUBY_RELEASE_CODE 20081104 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 4 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3