Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

thread.c: Mutex#synchronize no block params

* thread.c (rb_mutex_synchronize_m): yield no block params.  patch by
  splattael (Peter Suschlik) in [ruby-core:53773] [Bug #8097].
  fix GH-266.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 99155e20a0077e423a2c44551a70f6b01746f36f 1 parent 2418b20
@nobu nobu authored
Showing with 12 additions and 1 deletion.
  1. +6 −0 ChangeLog
  2. +5 −0 test/ruby/test_thread.rb
  3. +1 −1  thread.c
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 29 22:09:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_mutex_synchronize_m): yield no block params. patch by
+ splattael (Peter Suschlik) in [ruby-core:53773] [Bug #8097].
+ fix GH-266.
+
Fri Mar 29 16:51:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_next_argv): set init flag if succeeded to forward, after
View
5 test/ruby/test_thread.rb
@@ -120,6 +120,11 @@ def test_mutex_synchronize
assert_equal(max * max * max, r)
end
+ def test_mutex_synchronize_yields_no_block_params
+ bug8097 = '[ruby-core:53424] [Bug #8097]'
+ assert_empty(Mutex.new.synchronize {|*params| break params}, bug8097)
+ end
+
def test_local_barrier
dir = File.dirname(__FILE__)
lbtest = File.join(dir, "lbtest.rb")
View
2  thread.c
@@ -4567,7 +4567,7 @@ rb_mutex_synchronize_m(VALUE self, VALUE args)
rb_raise(rb_eThreadError, "must be called with a block");
}
- return rb_mutex_synchronize(self, rb_yield, Qnil);
+ return rb_mutex_synchronize(self, rb_yield, Qundef);
}
void rb_mutex_allow_trap(VALUE self, int val)
Please sign in to comment.
Something went wrong with that request. Please try again.