Fix double-close of FD on garbage collection (rcrowley#25)

mtharp · Jun 24, 2016 · c0d4995 · c0d4995
1 parent f2f192b
commit c0d4995
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/goagain.go b/goagain.go
@@ -170,7 +170,11 @@ func Listener() (l net.Listener, err error) {
 	if _, err = fmt.Sscan(os.Getenv("GOAGAIN_FD"), &fd); nil != err {
 		return
 	}
-	l, err = net.FileListener(os.NewFile(fd, os.Getenv("GOAGAIN_NAME")))
+	// NewFile takes over the fd but FileListener makes its own copy. Make sure
+	// to clean up the former.
+	fdf := os.NewFile(fd, os.Getenv("GOAGAIN_NAME"))
+	defer fdf.Close()
+	l, err = net.FileListener(fdf)
 	if nil != err {
 		return
 	}
@@ -183,9 +187,6 @@ func Listener() (l net.Listener, err error) {
 		)
 		return
 	}
-	if err = syscall.Close(int(fd)); nil != err {
-		return
-	}
 	return
 }