More validation of solve moves in Flood

To avoid assertion failures while painting it, we need to ensure that
the purported solution in a solve move doesn't include filling with the
current top-left colour at any point.  That means checking the first
entry against the current top-left colours, and each later one against
its predecessor.

1 files changed, 5 insertions, 0 deletions

diff --git a/flood.c b/flood.c
index f1ac5e1..7a83e52 100644
--- a/flood.c
+++ b/flood.c
@@ -945,6 +945,11 @@ static game_state *execute_move(const game_state *state, const char *move)
                 return NULL;
             };
             sol->moves[i] = atoi(p);
+            if (i == 0 ?
+                sol->moves[i] == state->grid[FILLY * state->w + FILLX] :
+                sol->moves[i] == sol->moves[i-1])
+                /* Solution contains a fill with the current colour. */
+                goto badsolve;
             p += strspn(p, "0123456789");
             if (*p) {
                 if (*p != ',') goto badsolve;