diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/dl/lib/dl/func.rb | 2 | ||||
| -rw-r--r-- | test/dl/test_func.rb | 8 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Thu Dec 20 18:36:19 2012 Naohisa Goto <ngotogenome@gmail.com> + + * ext/dl/lib/dl/func.rb (DL::Function#bind): When Fiddle is used, + @ptr should be updated. This fixes SEGV raised in DL::Function#call + after calling DL::Function#bind. [Bug #7516] [ruby-dev:46708] + + * test/dl/test_func.rb (test_bind): test for the above + Thu Dec 20 18:35:36 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * gc.h (SET_MACHINE_STACK_END): add volatile for preventing diff --git a/ext/dl/lib/dl/func.rb b/ext/dl/lib/dl/func.rb index 3c2245f413..3e82dcde20 100644 --- a/ext/dl/lib/dl/func.rb +++ b/ext/dl/lib/dl/func.rb @@ -86,6 +86,8 @@ module DL @block.call(*args) end }.new(@cfunc.ctype, @args, block) + @ptr = @cfunc + return nil else if( !block ) raise(RuntimeError, "block must be given.") diff --git a/test/dl/test_func.rb b/test/dl/test_func.rb index 761ae43143..819e3eb952 100644 --- a/test/dl/test_func.rb +++ b/test/dl/test_func.rb @@ -9,6 +9,14 @@ module DL assert_equal 'strcpy', f.name end + def test_bind + f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT]) + assert_nothing_raised { + f.bind { |x, y| x + y } + } + assert_equal 579, f.call(123, 456) + end + def test_to_i cfunc = CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy') f = Function.new(cfunc, [TYPE_VOIDP, TYPE_VOIDP]) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 348 +#define RUBY_PATCHLEVEL 349 #define RUBY_RELEASE_DATE "2012-12-20" #define RUBY_RELEASE_YEAR 2012 |