1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (ruby_cleanup): use rb_ary_free to free internal object.

Browse Source 
* gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free.
  [ruby-core:35192]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-02-11 10:45:34 +00:00
parent 18364f541b
commit 96c078c340
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Feb 11 19:45:26 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (ruby_cleanup): use rb_ary_free to free internal object.
* gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free.
[ruby-core:35192]
Fri Feb 11 16:57:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Feb 11 16:57:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby/test_transcode.rb (test_from_cp50221): fix wrong * test/ruby/test_transcode.rb (test_from_cp50221): fix wrong

2
eval.c
View File

@ -170,7 +170,7 @@ ruby_cleanup(volatile int ex)
for (i=RARRAY_LEN(ary) - 1; i>=0; i--) { for (i=RARRAY_LEN(ary) - 1; i>=0; i--) {
((void(*)(rb_vm_t*))RARRAY_PTR(ary)[i])(vm); ((void(*)(rb_vm_t*))RARRAY_PTR(ary)[i])(vm);
} }
rb_ary_clear(ary); rb_ary_free(ary);
#if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1 #if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1
switch (ex) { switch (ex) {

2
gc.h
View File

@ -58,7 +58,7 @@ rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr)
#endif #endif
#define RUBY_MARK_UNLESS_NULL(ptr) if(RTEST(ptr)){rb_gc_mark(ptr);} #define RUBY_MARK_UNLESS_NULL(ptr) if(RTEST(ptr)){rb_gc_mark(ptr);}
#define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);} #define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);(ptr)=NULL;}
#if STACK_GROW_DIRECTION > 0 #if STACK_GROW_DIRECTION > 0
# define STACK_UPPER(x, a, b) (a) # define STACK_UPPER(x, a, b) (a)

11
test/ruby/test_thread.rb
View File

@ -384,7 +384,7 @@ class TestThread < Test::Unit::TestCase
end end
INPUT INPUT
assert_in_out_err(%w(--disable-gems -d), <<-INPUT, %w(false 2), /.+/) assert_in_out_err(%w(--disable-gems -d), <<-INPUT, %w(false 2), %r".+")
p Thread.abort_on_exception p Thread.abort_on_exception
begin begin
Thread.new { raise } Thread.new { raise }
@ -577,6 +577,15 @@ class TestThread < Test::Unit::TestCase
assert_nothing_raised {arr.hash} assert_nothing_raised {arr.hash}
assert(obj[:visited]) assert(obj[:visited])
end end
def test_thread_instance_variable
bug4389 = '[ruby-core:35192]'
assert_in_out_err([], <<-INPUT, %w(), [], bug4389)
class << Thread.current
@data = :data
end
INPUT
end
end end
class TestThreadGroup < Test::Unit::TestCase class TestThreadGroup < Test::Unit::TestCase

2
vm.c
View File

@ -230,7 +230,7 @@ env_free(void * const ptr)
{ {
RUBY_FREE_ENTER("env"); RUBY_FREE_ENTER("env");
if (ptr) { if (ptr) {
const rb_env_t * const env = ptr; rb_env_t *const env = ptr;
RUBY_FREE_UNLESS_NULL(env->env); RUBY_FREE_UNLESS_NULL(env->env);
ruby_xfree(ptr); ruby_xfree(ptr);
} }