=== modified file 'lib/IO/Select.pm'
--- lib/IO/Select.pm 2014-02-20 17:42:18 +0000
+++ lib/IO/Select.pm 2014-02-20 18:27:02 +0000
@@ -58,7 +58,21 @@
my($self, $f) = @_;
return unless defined $f;
$f = $f->[0] if ref($f) eq 'ARRAY';
- ($f =~ /^\d+$/) ? $f : fileno($f);
+ if($f =~ /^\d+$/) { # plain file number
+ return $f;
+ }
+ elsif(defined(my $fd = fileno($f))) {
+ return $fd;
+ }
+ else {
+ # Neither a plain file number nor an opened filehandle; but maybe it was
+ # previously registered and has since been closed. ->remove still wants to
+ # know what fileno it had
+ foreach my $i ( FIRST_FD .. $#$self ) {
+ return $i - FIRST_FD if $self->[$i] == $f;
+ }
+ return undef;
+ }
}
sub _update
=== added file 't/rt77740.t'
--- t/rt77740.t 1970-01-01 00:00:00 +0000
+++ t/rt77740.t 2014-02-20 18:27:02 +0000
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+
+# Regression test for
https://rt.cpan.org/Ticket/Display.html?id=77740
+
+use strict;
+use warnings;
+
+use Test::More;
+
+use IO::Select;
+
+use IO::Handle;
+
+pipe( my $rd, my $wr ) or die "Cannot pipe() - $!";
+$wr->syswrite( "data\n" );
+
+my $select = IO::Select->new();
+$select->add( $rd );
+
+is( scalar $select->handles, 1, '$select has 1 handle' );
+
+# close first, then remove afterwards
+$rd->close;
+$select->remove( $rd );
+
+is( scalar $select->handles, 0, '$select has 0 handles' );
+
+done_testing;
