From: Simon Tatham Date: Thu, 5 Jan 2006 09:40:51 +0000 (+0000) Subject: Revert a change in an assertion made in r6299. It was right the X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ac027d9d0876c98d60d0d0e9e3ba3576cb0f41cd;p=sgt-puzzles.git Revert a change in an assertion made in r6299. It was right the first time, and now has a comment explaining why! [originally from svn r6511] [r6299 == c389f623f66fe5296f7ef5c66d88884607b82cff] --- diff --git a/loopy.c b/loopy.c index 9f54c8a..f70e5b1 100644 --- a/loopy.c +++ b/loopy.c @@ -1210,8 +1210,14 @@ static char *encode_solve_move(const game_state *state) } } - /* No point in doing sums like that if they're going to be wrong */ - assert(strlen(ret) == (size_t)len); + /* + * Ensure we haven't overrun the buffer we allocated (which we + * really shouldn't have, since we computed its maximum size). + * Note that this assert is <= rather than ==, because the + * solver is permitted to produce an incomplete solution in + * which case the buffer will be only partially used. + */ + assert(strlen(ret) <= (size_t)len); return ret; }