* array.c (rb_ary_bsearch): Raise TypeError on bad return from block

* range.c (range_bsearch): ditto

* test/ruby/test_array.rb (class): Test for above

* test/ruby/test_range.rb (class): ditto

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

1 files changed, 7 insertions, 0 deletions

diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb
index d859969ded..1f370cfaee 100644
--- a/test/ruby/test_range.rb
+++ b/test/ruby/test_range.rb
@@ -357,6 +357,13 @@ class TestRange < Test::Unit::TestCase
     assert_equal 42, (1..42).each.size
   end
 
+  def test_bsearch_typechecks_return_values
+    assert_raise(TypeError) do
+      (1..42).bsearch{ "not ok" }
+    end
+    assert_equal (1..42).bsearch{}, (1..42).bsearch{false}
+  end
+
   def test_bsearch_with_no_block
     enum = (42...666).bsearch
     assert_nil enum.size