kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

fiddle/function.c: fix memory leak on exception

Browse source 
* ext/fiddle/function.c (function_call): fix memory leak when an
  exception occurs at argument conversion or the function call.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-03-09 04:51:38 +00:00
parent 1692e54793
commit dfdb8b7372
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Sun Mar 9 06:42:40 2014 Eric Wong <e@80x24.org>
* variable.c (struct global_variable): shrink by 8 bytes on 64-bit * variable.c (struct global_variable): shrink by 8 bytes on 64-bit

9
ext/fiddle/function.c
View file

@ -137,6 +137,7 @@ function_call(int argc, VALUE argv[], VALUE self)
void **values; void **values;
VALUE cfunc, types, cPointer; VALUE cfunc, types, cPointer;
int i; int i;
VALUE alloc_buffer = 0;
cfunc = rb_iv_get(self, "@ptr"); cfunc = rb_iv_get(self, "@ptr");
types = rb_iv_get(self, "@args"); 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 = ALLOCV(alloc_buffer,
generic_args = xcalloc((size_t)argc, (size_t)sizeof(fiddle_generic)); (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++) { for (i = 0; i < argc; i++) {
VALUE type = RARRAY_PTR(types)[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)); rb_funcall(mFiddle, rb_intern("win32_last_error="), 1, INT2NUM(errno));
#endif #endif
xfree(values); ALLOCV_END(alloc_buffer);
xfree(generic_args);
return GENERIC2VALUE(rb_iv_get(self, "@return_type"), retval); return GENERIC2VALUE(rb_iv_get(self, "@return_type"), retval);
} }

9
test/fiddle/test_function.rb
View file

@ -1,10 +1,13 @@
begin begin
require_relative 'helper' require_relative 'helper'
require_relative '../ruby/envutil'
rescue LoadError rescue LoadError
end end
module Fiddle module Fiddle
class TestFunction < Fiddle::TestCase class TestFunction < Fiddle::TestCase
include Test::Unit::Assertions
def setup def setup
super super
Fiddle.last_error = nil Fiddle.last_error = nil
@ -70,5 +73,11 @@ module Fiddle
assert_equal("123", buff) assert_equal("123", buff)
assert_equal("123", str.to_s) assert_equal("123", str.to_s)
end 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
end if defined?(Fiddle) end if defined?(Fiddle)