diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | range.c | 29 |
2 files changed, 24 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Fri Sep 26 00:40:30 2008 Yusuke Endoh <mame@tsg.ne.jp> + + * range.c (range_inspect): fix SEGV for cyclic range object. + [ruby-core:18835] + Thu Sep 25 23:59:56 2008 Tanaka Akira <akr@fsij.org> * common.mk: dependency updated. @@ -663,6 +663,24 @@ range_to_s(VALUE range) return str; } +static VALUE +inspect_range(VALUE range, VALUE dummy, int recur) +{ + VALUE str, str2; + + if (recur) { + return rb_str_new2(EXCL(range) ? "(... ... ...)" : "(... .. ...)"); + } + str = rb_inspect(RANGE_BEG(range)); + str2 = rb_inspect(RANGE_END(range)); + str = rb_str_dup(str); + rb_str_cat(str, "...", EXCL(range) ? 3 : 2); + rb_str_append(str, str2); + OBJ_INFECT(str, str2); + + return str; +} + /* * call-seq: * rng.inspect => string @@ -676,16 +694,7 @@ range_to_s(VALUE range) static VALUE range_inspect(VALUE range) { - VALUE str, str2; - - str = rb_inspect(RANGE_BEG(range)); - str2 = rb_inspect(RANGE_END(range)); - str = rb_str_dup(str); - rb_str_cat(str, "...", EXCL(range) ? 3 : 2); - rb_str_append(str, str2); - OBJ_INFECT(str, str2); - - return str; + return rb_exec_recursive(inspect_range, range, 0); } /* |