Commit893c43b

authored

Merge pull requestdigitalocean#74 from digitalocean/geoff/dont-panic

Fix a panic caused by writing to a closed channel, silence a warning

2 parents290a4e9 +1c122ff commit893c43bCopy full SHA for 893c43b

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ func (l *Lexer) Error(s string) {`
`137`	`137`	`// the items channel, and sets the state to nil, which stops the lexer's state`
`138`	`138`	`// machine.`
`139`	`139`	`func (l*Lexer)errorf(formatstring,args...interface{})stateFn {`
`140`		`-l.items<-item{ERROR,fmt.Sprintf(format,args),l.line,l.column}`
	`140`	`+l.items<-item{ERROR,fmt.Sprintf(format,args...),l.line,l.column}`
`141`	`141`	`returnnil`
`142`	`142`	`}`
`143`	`143`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,8 @@ func (l *Libvirt) callback(id uint32, res response) {`
`177`	`177`	`c,ok:=l.callbacks[id]`
`178`	`178`	`l.cm.Unlock()`
`179`	`179`	`ifok {`
`180`		`-// we close channel in deregister() so that we don't block here forever without receiver`
	`180`	`+// we close the channel in deregister() so that we don't block here`
	`181`	`+// forever without a receiver. If that happens, this write will panic.`
`181`	`182`	`deferfunc() {`
`182`	`183`	`recover()`
`183`	`184`	`}()`
`@@ -219,7 +220,13 @@ func (l *Libvirt) stream(buf []byte) {`
`219`	`220`	`l.em.Lock()`
`220`	`221`	`c,ok:=l.events[e.CallbackID]`
`221`	`222`	`l.em.Unlock()`
	`223`	`+`
`222`	`224`	`ifok {`
	`225`	`+// we close the channel in deregister() so that we don't block here`
	`226`	`+// forever without a receiver. If that happens, this write will panic.`
	`227`	`+deferfunc() {`
	`228`	`+recover()`
	`229`	`+}()`
`223`	`230`	`c<-e`
`224`	`231`	`}`
`225`	`232`	`}`

Comments

(0)