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

* io.c (fptr_finalize): write_mutex might have been destroyed

Browse source 
already in finalization phase, as the order of finalizers is not
  guaranteed.  rb_mutex_t should be used in place of Mutex object
  in the future.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-10-06 02:52:26 +00:00
parent a413c84e54
commit 915ae780c3
3 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Oct 6 11:52:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (fptr_finalize): write_mutex might have been destroyed
already in finalization phase, as the order of finalizers is not
guaranteed. rb_mutex_t should be used in place of Mutex object
in the future.
Tue Oct 5 22:17:02 2010 wanabe <s.wanabe@gmail.com>
* win32/mkexports.rb: revert r29320 and r29402.

12
io.c
View file

@ -3459,7 +3459,7 @@ fptr_finalize(rb_io_t *fptr, int noraise)
{
VALUE err = Qnil;
if (fptr->writeconv) {
if (fptr->write_lock) {
if (fptr->write_lock && !noraise) {
struct finish_writeconv_arg arg;
arg.fptr = fptr;
arg.noalloc = noraise;
@ -3470,8 +3470,14 @@ fptr_finalize(rb_io_t *fptr, int noraise)
}
}
if (fptr->wbuf_len) {
if (io_fflush(fptr) < 0 && NIL_P(err))
err = noraise ? Qtrue : INT2NUM(errno);
if (noraise) {
if ((int)io_flush_buffer_sync(fptr) < 0 && NIL_P(err))
err = Qtrue;
}
else {
if (io_fflush(fptr) < 0 && NIL_P(err))
err = INT2NUM(errno);
}
}
if (IS_PREP_STDIO(fptr) || fptr->fd <= 2) {
goto skip_fd_close;

29
test/ruby/test_io.rb
View file

@ -1625,4 +1625,33 @@ End
end
end.each {|th| th.join}
end
def test_flush_in_finalizer1
require 'tempfile'
bug3910 = '[ruby-dev:42341]'
path = Tempfile.new("bug3910").path
fds = []
assert_nothing_raised(TypeError, bug3910) do
500.times {
f = File.open(path, "w")
fds << f.fileno
f.print "hoge"
}
end
ensure
fds.each {|fd| IO.for_fd(fd).close rescue next}
end
def test_flush_in_finalizer2
require 'tempfile'
bug3910 = '[ruby-dev:42341]'
path = Tempfile.new("bug3910").path
1.times do
io = open(path,"w")
io.print "hoge"
end
assert_nothing_raised(TypeError, bug3910) do
GC.start
end
end
end