From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Original-To: poffice@blade.nagaokaut.ac.jp Delivered-To: poffice@blade.nagaokaut.ac.jp Received: from kankan.nagaokaut.ac.jp (smtp.nagaokaut.ac.jp [133.44.2.24]) by blade.nagaokaut.ac.jp (Postfix) with ESMTP id 934AE19E005A for ; Mon, 21 Dec 2015 18:36:34 +0900 (JST) Received: from voscc.nagaokaut.ac.jp (voscc.nagaokaut.ac.jp [133.44.1.100]) by kankan.nagaokaut.ac.jp (Postfix) with ESMTP id 068B7B5D8D2 for ; Mon, 21 Dec 2015 19:08:50 +0900 (JST) Received: from neon.ruby-lang.org (neon.ruby-lang.org [221.186.184.75]) by voscc.nagaokaut.ac.jp (Postfix) with ESMTP id ABBAE18CC7FC for ; Mon, 21 Dec 2015 19:08:50 +0900 (JST) Received: from [221.186.184.76] (localhost [IPv6:::1]) by neon.ruby-lang.org (Postfix) with ESMTP id 8F6191204D3; Mon, 21 Dec 2015 19:08:49 +0900 (JST) X-Original-To: ruby-core@ruby-lang.org Delivered-To: ruby-core@ruby-lang.org Received: from dcvr.yhbt.net (dcvr.yhbt.net [64.71.152.64]) by neon.ruby-lang.org (Postfix) with ESMTP id 54F62120463 for ; Mon, 21 Dec 2015 19:08:46 +0900 (JST) Received: from localhost (dcvr.yhbt.net [127.0.0.1]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPSA id BE3CC6338C0; Mon, 21 Dec 2015 10:08:45 +0000 (UTC) Date: Mon, 21 Dec 2015 10:08:45 +0000 From: Eric Wong To: ruby-core@ruby-lang.org Message-ID: <20151221100845.GA14896@dcvr.yhbt.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-ML-Name: ruby-core X-Mail-Count: 72419 Subject: [ruby-core:72419] Re: [Ruby trunk - Bug #11854] [Open] Socket.for_fd(-1) causes segmentaion fault on mingw32. X-BeenThere: ruby-core@ruby-lang.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Ruby developers List-Id: Ruby developers List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: ruby-core-bounces@ruby-lang.org Sender: "ruby-core" Proposed fix (not sure about the error message saying "fstat(2)", now...) Subject: [PATCH] avoid rb_bug on BasicSocket.for_fd(-1) * ext/socket/init.c (rsock_init_sock): check FD after validating * test/socket/test_basicsocket.rb (test_for_fd): new [ruby-core:72418] [Bug #11854] --- ext/socket/init.c | 2 +- test/socket/test_basicsocket.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ext/socket/init.c b/ext/socket/init.c index d071102..bd06926 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -61,10 +61,10 @@ rsock_init_sock(VALUE sock, int fd) { rb_io_t *fp; - rb_update_max_fd(fd); if (!is_socket(fd)) rb_raise(rb_eArgError, "not a socket file descriptor"); + rb_update_max_fd(fd); MakeOpenFile(sock, fp); fp->fd = fd; fp->mode = FMODE_READWRITE|FMODE_DUPLEX; diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb index 227034e..52732f1 100644 --- a/test/socket/test_basicsocket.rb +++ b/test/socket/test_basicsocket.rb @@ -133,4 +133,15 @@ def test_close_write end end + def test_for_fd + assert_raise(Errno::EBADF, '[ruby-core:72418] [Bug #11854]') do + BasicSocket.for_fd(-1) + end + inet_stream do |sock| + s = BasicSocket.for_fd(sock.fileno) + assert_instance_of BasicSocket, s + s.autoclose = false + sock.close + end + end end if defined?(BasicSocket) -- EW