* string.c (rb_str_sum): wrong cast caused wrong result.

  [ruby-dev:24385]

* enum.c (enum_sort_by): hide temporary array from
  ObjectSpace.each_object.  [ruby-dev:24386]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/enum.c b/enum.c
index b5de2a3fc..a32966592 100644
--- a/enum.c
+++ b/enum.c
@@ -493,6 +493,7 @@ enum_sort_by(obj)
     else {
 	ary = rb_ary_new();
     }
+    RBASIC(ary)->klass = 0;
     rb_iterate(rb_each, obj, sort_by_i, ary);
     if (RARRAY(ary)->len > 1) {
 	rb_iterate(rb_ary_sort_bang, ary, sort_by_cmp, ary);
@@ -500,6 +501,7 @@ enum_sort_by(obj)
     for (i=0; i<RARRAY(ary)->len; i++) {
 	RARRAY(ary)->ptr[i] = RNODE(RARRAY(ary)->ptr[i])->u2.value;
     }
+    RBASIC(ary)->klass = rb_cArray;
     return ary;
 }