[macruby-changes] [4772] MacRuby/trunk/ext/socket/socket.c

[source_changes at macosforge.org]

Revision: 4772
          http://trac.macosforge.org/projects/ruby/changeset/4772
Author:   lsansonetti at apple.com
Date:     2010-10-08 18:58:32 -0700 (Fri, 08 Oct 2010)
Log Message:
-----------
fix a bug in BasicSocket#close_{read,write} where we wouldn't raise an exception in case the stream was already closed

Modified Paths:
--------------
    MacRuby/trunk/ext/socket/socket.c

Modified: MacRuby/trunk/ext/socket/socket.c
===================================================================
--- MacRuby/trunk/ext/socket/socket.c	2010-10-09 00:07:35 UTC (rev 4771)
+++ MacRuby/trunk/ext/socket/socket.c	2010-10-09 01:58:32 UTC (rev 4772)
@@ -298,6 +298,7 @@
 	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
     }
     GetOpenFile(sock, fptr);
+    rb_io_check_closed(fptr);
     shutdown(fptr->fd, 0);
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	return rb_io_close(sock);
@@ -317,6 +318,7 @@
 	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
     }
     GetOpenFile(sock, fptr);
+    rb_io_check_closed(fptr);
     if (!(fptr->mode & FMODE_READABLE)) {
 	return rb_io_close(sock);
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101008/a3c7ff8e/attachment-0001.html>