diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/fiddle/function.c | 9 | ||||
| -rw-r--r-- | test/fiddle/test_function.rb | 9 |
3 files changed, 19 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun Mar 9 13:51:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/fiddle/function.c (function_call): fix memory leak when an + exception occurs at argument conversion or the function call. + Sun Mar 9 06:42:40 2014 Eric Wong <e@80x24.org> * variable.c (struct global_variable): shrink by 8 bytes on 64-bit diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c index 4c297f7751..50366bb87f 100644 --- a/ext/fiddle/function.c +++ b/ext/fiddle/function.c @@ -137,6 +137,7 @@ function_call(int argc, VALUE argv[], VALUE self) void **values; VALUE cfunc, types, cPointer; int i; + VALUE alloc_buffer = 0; cfunc = rb_iv_get(self, "@ptr"); types = rb_iv_get(self, "@args"); @@ -159,8 +160,9 @@ function_call(int argc, VALUE argv[], VALUE self) } } - values = xcalloc((size_t)argc + 1, (size_t)sizeof(void *)); - generic_args = xcalloc((size_t)argc, (size_t)sizeof(fiddle_generic)); + generic_args = ALLOCV(alloc_buffer, + (size_t)(argc + 1) * sizeof(void *) + (size_t)argc * sizeof(fiddle_generic)); + values = (void **)((char *)generic_args + (size_t)argc * sizeof(fiddle_generic)); for (i = 0; i < argc; i++) { VALUE type = RARRAY_PTR(types)[i]; @@ -187,8 +189,7 @@ function_call(int argc, VALUE argv[], VALUE self) rb_funcall(mFiddle, rb_intern("win32_last_error="), 1, INT2NUM(errno)); #endif - xfree(values); - xfree(generic_args); + ALLOCV_END(alloc_buffer); return GENERIC2VALUE(rb_iv_get(self, "@return_type"), retval); } diff --git a/test/fiddle/test_function.rb b/test/fiddle/test_function.rb index e617c0b61e..63dfbd6e5d 100644 --- a/test/fiddle/test_function.rb +++ b/test/fiddle/test_function.rb @@ -1,10 +1,13 @@ begin require_relative 'helper' + require_relative '../ruby/envutil' rescue LoadError end module Fiddle class TestFunction < Fiddle::TestCase + include Test::Unit::Assertions + def setup super Fiddle.last_error = nil @@ -70,5 +73,11 @@ module Fiddle assert_equal("123", buff) assert_equal("123", str.to_s) end + + def test_no_memory_leak + prep = 'r = Fiddle::Function.new(Fiddle.dlopen(nil)["rb_obj_tainted"], [Fiddle::TYPE_UINTPTR_T], Fiddle::TYPE_UINTPTR_T); a = "a"' + code = 'begin r.call(a); rescue TypeError; end' + assert_no_memory_leak(%w[-W0 -rfiddle], "#{prep}\n1000.times{#{code}}", "10_000.times {#{code}}", limit: 1.2) + end end end if defined?(Fiddle) |