ref: bbf800e49ee5965c21eb4a89116e7529d0d4954f
parent: 6567260eb0af75a3c82f4a8a8292c6446d94fd98
author: Simon Tatham <anakin@pobox.com>
date: Sun Jul 29 17:29:26 EDT 2012
Don't fail an assertion when setting up the provided clues at the start of the solver, if they contradict each other. (Could trigger on user-provided grids.) [originally from svn r9594]
--- a/solo.c
+++ b/solo.c
@@ -1773,9 +1773,16 @@
* Place all the clue numbers we are given.
*/
for (x = 0; x < cr; x++)
- for (y = 0; y < cr; y++)
- if (grid[y*cr+x])
+ for (y = 0; y < cr; y++) {
+ int n = grid[y*cr+x];
+ if (n) {
+ if (!cube(x,y,n)) {
+ diff = DIFF_IMPOSSIBLE;
+ goto got_result;
+ }
solver_place(usage, x, y, grid[y*cr+x]);
+ }
+ }
/*
* Now loop over the grid repeatedly trying all permitted modes