icyci: avoid timer deadlock in transitionState

If stateTransTimer has already been stopped (without reset) then drain
will deadlock. Avoid this by using a select + default case, as done in
golang/go#27169 .

Signed-off-by: David Disseldorp <[email protected]>

Author: ddiss

icyci.go

@@ -419,7 +419,11 @@ func transitionState(newState State, curState *State,
 	*curState = newState
 
 	if !stateTransTimer.Stop() {
-		<-stateTransTimer.C
+		// select + default to avoid deadlock when already stopped
+		select {
+		case <-stateTransTimer.C:
+		default:
+		}
 	}
 	if states[newState].timeout == time.Duration(0) {
 		log.Printf("state %d doesn't timeout", newState)