archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 34250:

Browse source 
* gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
	  an exception under rb_protect(). [ruby-dev:45113]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ayumin 2012-02-07 04:59:18 +00:00
parent 04918f8156
commit cb94d9df62
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 7 13:59:26 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
an exception under rb_protect(). [ruby-dev:45113]
Mon Feb 6 15:34:47 2012 Tanaka Akira <akr@fsij.org>
* ruby.c (fill_standard_fds): use fstat() instead of fcntl(F_GETFD)

3
gc.c
View file

@ -2918,7 +2918,10 @@ run_finalizer(rb_objspace_t *objspace, VALUE objid, VALUE table)
VALUE final = RARRAY_PTR(table)[i];
args[0] = RARRAY_PTR(final)[1];
args[2] = FIX2INT(RARRAY_PTR(final)[0]);
status = 0;
rb_protect(run_single_final, (VALUE)args, &status);
if (status)
rb_set_errinfo(Qnil);
}
}

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 46
#define RUBY_PATCHLEVEL 47
#define RUBY_RELEASE_DATE "2012-02-07"
#define RUBY_RELEASE_YEAR 2012