diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | test/ruby/test_array.rb | 9 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | vm_eval.c | 7 |
4 files changed, 25 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Sun Apr 14 02:13:25 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * vm_eval.c (check_funcall_respond_to): preserve passed_block, which + is modified in vm_call0_body() via vm_call0(), and caused a bug of + rb_check_funcall() by false negative result of rb_block_given_p(). + re-fix [ruby-core:53650] [Bug #8153]. + [ruby-core:53653] [Bug #8154] + Fri Apr 12 04:16:30 2013 Naohisa Goto <ngotogenome@gmail.com> * marshal.c (marshal_dump, marshal_load): workaround for segv on diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 17f2ef66c4..a8b514c830 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1918,6 +1918,15 @@ class TestArray < Test::Unit::TestCase assert_equal([['a', 5], ['b', 6]], %w(a b).zip(ary)) end + def test_zip_bug + bug8153 = "ruby-core:53650" + r = 1..1 + def r.respond_to?(*) + super + end + assert_equal [[42, 1]], [42].zip(r), bug8153 + end + def test_transpose assert_equal([[1, :a], [2, :b], [3, :c]], [[1, 2, 3], [:a, :b, :c]].transpose) @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-04-13" -#define RUBY_PATCHLEVEL 121 +#define RUBY_RELEASE_DATE "2013-04-14" +#define RUBY_PATCHLEVEL 122 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #include "ruby/version.h" @@ -358,7 +358,8 @@ check_funcall_respond_to(rb_thread_t *th, VALUE klass, VALUE recv, ID mid) const rb_method_entry_t *me = rb_method_entry(klass, idRespond_to, &defined_class); if (me && !(me->flag & NOEX_BASIC)) { - VALUE args[2]; + const rb_block_t *passed_block = th->passed_block; + VALUE args[2], result; int arity = rb_method_entry_arity(me); if (arity > 2) @@ -368,7 +369,9 @@ check_funcall_respond_to(rb_thread_t *th, VALUE klass, VALUE recv, ID mid) args[0] = ID2SYM(mid); args[1] = Qtrue; - if (!RTEST(vm_call0(th, recv, idRespond_to, arity, args, me, defined_class))) { + result = vm_call0(th, recv, idRespond_to, arity, args, me, defined_class); + th->passed_block = passed_block; + if (!RTEST(result)) { return FALSE; } } |