Properly clean fds when newFdPoller fails

diff --git a/inotify_poller.go b/inotify_poller.go
index 581431d957fc2aa1e9f8cb75b5ccf8db5f4bb27e..00970383a1138d6cac3dc5ab411138b6aa2b2e51 100644 (file)
--- a/inotify_poller.go
+++ b/inotify_poller.go
@@ -19,8 +19,8 @@ type fdPoller struct {
 
 // Create a new inotify poller.
 // This creates an inotify handler, and an epoll handler.
-func newFdPoller(fd int) (poller *fdPoller, errno error) {
-       poller = new(fdPoller)
+func newFdPoller(fd int) (_ *fdPoller, errno error) {
+       poller := new(fdPoller)
        defer func() {
                if errno != nil {
                        poller.close()

diff --git a/inotify_poller_test.go b/inotify_poller_test.go
index 83176585edc916781d6826f984a52a7a621058e3..83dc58046e058e6a07ad2bc0b7ff726b0a053cbf 100644 (file)
--- a/inotify_poller_test.go
+++ b/inotify_poller_test.go
@@ -64,6 +64,13 @@ func makePoller(t *testing.T) (testFd, *fdPoller) {
        return tfd, poller
 }
 
+func TestPollerWithBadFd(t *testing.T) {
+       _, err := newFdPoller(-1)
+       if err != syscall.EBADF {
+               t.Fatalf("Expected EBADF, got: %v", err)
+       }
+}
+
 func TestPollerWithData(t *testing.T) {
        tfd, poller := makePoller(t)
        defer tfd.close()