From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Mon, 12 Jan 2009 20:30:12 +0000 (+0000)
Subject: Patch from James H to fix some off-by-one errors in Guess's click
X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/commitdiff_plain/0dc6df563b8adda28a305ff9c5276b05441a9753

Patch from James H to fix some off-by-one errors in Guess's click
rectangle checking, preventing array bounds violation.


git-svn-id: svn://svn.tartarus.org/sgt/puzzles@8409 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/guess.c b/guess.c
index 9a78225..38cdf25 100644
--- a/guess.c
+++ b/guess.c
@@ -655,20 +655,24 @@ static char *interpret_move(game_state *from, game_ui *ui, game_drawstate *ds,
 
     if (from->solved) return NULL;
 
-    if (x >= COL_OX && x <= (COL_OX + COL_W) &&
-        y >= COL_OY && y <= (COL_OY + COL_H)) {
+    if (x >= COL_OX && x < (COL_OX + COL_W) &&
+        y >= COL_OY && y < (COL_OY + COL_H)) {
         over_col = ((y - COL_OY) / PEGOFF) + 1;
+        assert(over_col >= 1 && over_col <= ds->colours->npegs);
     } else if (x >= guess_ox &&
-               y >= guess_oy && y <= (guess_oy + GUESS_H)) {
-        if (x <= (guess_ox + GUESS_W)) {
+               y >= guess_oy && y < (guess_oy + GUESS_H)) {
+        if (x < (guess_ox + GUESS_W)) {
             over_guess = (x - guess_ox) / PEGOFF;
+            assert(over_guess >= 0 && over_guess < ds->solution->npegs);
         } else {
             over_hint = 1;
         }
-    } else if (x >= guess_ox && x <= (guess_ox + GUESS_W) &&
+    } else if (x >= guess_ox && x < (guess_ox + GUESS_W) &&
                y >= GUESS_OY && y < guess_oy) {
         over_past_guess_y = (y - GUESS_OY) / PEGOFF;
         over_past_guess_x = (x - guess_ox) / PEGOFF;
+        assert(over_past_guess_y >= 0 && over_past_guess_y < from->next_go);
+        assert(over_past_guess_x >= 0 && over_past_guess_x < ds->solution->npegs);
     }
     debug(("make_move: over_col %d, over_guess %d, over_hint %d,"
            " over_past_guess (%d,%d)", over_col, over_guess, over_hint,