Bugfix: Avoid uint overflow for timeouts and other fields

Author: g3force

internal/app/publish/messagegenerator.go

@@ -111,17 +111,17 @@ func (g *MessageGenerator) StateToRefereeMessage(matchState *state.State) (r *st
 
 func updateTeam(teamInfo *state.Referee_TeamInfo, teamState *state.TeamInfo) {
 	*teamInfo.Name = *teamState.Name
-	*teamInfo.Score = uint32(*teamState.Goals)
-	*teamInfo.RedCards = uint32(len(teamState.RedCards))
+	*teamInfo.Score = unsigned32(*teamState.Goals)
+	*teamInfo.RedCards = unsigned(len(teamState.RedCards))
 	teamInfo.YellowCardTimes = mapYellowCardTimes(teamState.YellowCards)
-	*teamInfo.YellowCards = uint32(len(teamState.YellowCards))
-	*teamInfo.Timeouts = uint32(*teamState.TimeoutsLeft)
-	*teamInfo.Goalkeeper = uint32(*teamState.Goalkeeper)
-	*teamInfo.FoulCounter = uint32(len(teamState.Fouls))
-	*teamInfo.BallPlacementFailures = uint32(*teamState.BallPlacementFailures)
+	*teamInfo.YellowCards = unsigned(len(teamState.YellowCards))
+	*teamInfo.Timeouts = unsigned32(*teamState.TimeoutsLeft)
+	*teamInfo.Goalkeeper = unsigned32(*teamState.Goalkeeper)
+	*teamInfo.FoulCounter = unsigned(len(teamState.Fouls))
+	*teamInfo.BallPlacementFailures = unsigned32(*teamState.BallPlacementFailures)
 	*teamInfo.BallPlacementFailuresReached = *teamState.BallPlacementFailuresReached
 	*teamInfo.CanPlaceBall = *teamState.CanPlaceBall
-	*teamInfo.MaxAllowedBots = uint32(*teamState.MaxAllowedBots)
+	*teamInfo.MaxAllowedBots = unsigned32(*teamState.MaxAllowedBots)
 	*teamInfo.BotSubstitutionIntent = *teamState.BotSubstitutionIntent
 	timeoutTime, _ := ptypes.Duration(teamState.TimeoutTimeLeft)
 	*teamInfo.TimeoutTime = mapTime(timeoutTime)
@@ -160,3 +160,16 @@ func newTeamInfo() (t *state.Referee_TeamInfo) {
 	t.BotSubstitutionIntent = new(bool)
 	return
 }
+
+func unsigned32(v int32) uint32 {
+	if v < 0 {
+		return 0
+	}
+	return uint32(v)
+}
+func unsigned(v int) uint32 {
+	if v < 0 {
+		return 0
+	}
+	return uint32(v)
+}

internal/app/statemachine/change_command.go

@@ -18,7 +18,9 @@ func (s *StateMachine) processChangeNewCommand(newState *state.State, newCommand
 	case state.Command_KICKOFF, state.Command_PENALTY:
 		newState.CurrentActionTimeRemaining = ptypes.DurationProto(s.gameConfig.PrepareTimeout)
 	case state.Command_TIMEOUT:
-		*newState.TeamInfo(*newState.Command.ForTeam).TimeoutsLeft--
+		if *newState.TeamInfo(*newState.Command.ForTeam).TimeoutsLeft > 0 {
+			*newState.TeamInfo(*newState.Command.ForTeam).TimeoutsLeft--
+		}
 	}
 
 	// determine next command