* pack.c (pack_unpack): string conversion should at the top of the

  method.  [ruby-dev:24439]

* io.c (io_read): buffer should be frozen only after the length
  check.  [ruby-dev:24440]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7010 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/array.c b/array.c
index 7afc1301b5..3fe872b855 100644
--- a/array.c
+++ b/array.c
@@ -1572,6 +1572,7 @@ sort_1(a, b, data)
     int n;
 
     n = rb_cmpint(retval, *a, *b);
+    ary_sort_check(data);
     return n;
 }
 
@@ -1595,6 +1596,7 @@ sort_2(ap, bp, data)
 
     retval = rb_funcall(a, id_cmp, 1, b);
     n = rb_cmpint(retval, a, b);
+    ary_sort_check(data);
 
     return n;
 }