Fix dbus connection leaks introduced with sigconn

Vito Caputo · Vito Caputo · commit 142661727366 · 2014-10-14T19:45:16.000-04:00
diff --git a/dbus/dbus.go b/dbus/dbus.go
@@ -101,6 +101,7 @@ func NewUserConnection() (*Conn, error) {
 // Close closes an established connection
 func (c *Conn) Close() {
 	c.sysconn.Close()
+	c.sigconn.Close()
 }
 
 func newConnection(createBus func() (*dbus.Conn, error)) (*Conn, error) {
@@ -111,6 +112,7 @@ func newConnection(createBus func() (*dbus.Conn, error)) (*Conn, error) {
 
 	sigconn, err := dbusConnection(createBus)
 	if err != nil {
+		sysconn.Close()
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ func NewUserConnection() (*Conn, error) {`
`101`	`101`	`// Close closes an established connection`
`102`	`102`	`func (c *Conn) Close() {`
`103`	`103`	`c.sysconn.Close()`
	`104`	`+ c.sigconn.Close()`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`func newConnection(createBus func() (dbus.Conn, error)) (Conn, error) {`
`@@ -111,6 +112,7 @@ func newConnection(createBus func() (dbus.Conn, error)) (Conn, error) {`
`111`	`112`
`112`	`113`	`sigconn, err := dbusConnection(createBus)`
`113`	`114`	`if err != nil {`
	`115`	`+ sysconn.Close()`
`114`	`116`	`return nil, err`
`115`	`117`	`}`
`116`	`118`