From: Simon Tatham <anakin@pobox.com>
Date: Tue, 7 Feb 2006 21:45:50 +0000 (+0000)
Subject: Tal Kelrich spotted that hitting `Solve' on a configuration which is
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=c5001ca751641b341b90913ba67c9138923ab759;p=sgt-puzzles.git

Tal Kelrich spotted that hitting `Solve' on a configuration which is
laser-indistinguishable from the right solution _but_ has a number
of balls outside the acceptable range does not report an error. His
example was the game ID w8h8m5M5:1e3e6e80fa3e16265ccef7ca , omitting
the rightmost ball in the second row.

[originally from svn r6542]
---

diff --git a/blackbox.c b/blackbox.c
index 835175d..165ee2e 100644
--- a/blackbox.c
+++ b/blackbox.c
@@ -813,7 +813,9 @@ static int check_guesses(game_state *state, int cagey)
             ret = 0;
         }
     }
-    if (ret == 0) goto done;
+    if (ret == 0 ||
+	state->nguesses < state->minballs ||
+	state->nguesses > state->maxballs) goto done;
 
     /* fix up original state so the 'correct' balls end up matching the guesses,
      * as we've just proved that they were equivalent. */