From: Simon Tatham <anakin@pobox.com>
Date: Thu, 30 Jun 2005 08:25:47 +0000 (+0000)
Subject: Attempting to begin a drag from (i.e. just click on) the hint pegs
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=101324af67c5e7819849daeafb337dd4c1f45828;p=sgt-puzzles.git

Attempting to begin a drag from (i.e. just click on) the hint pegs
for a past guess caused strangeness up to and including segfault,
thanks to bad bounds checking. Well spotted John Sullivan.

[originally from svn r6040]
---

diff --git a/guess.c b/guess.c
index bf7a148..12d8b1b 100644
--- a/guess.c
+++ b/guess.c
@@ -637,7 +637,7 @@ static char *interpret_move(game_state *from, game_ui *ui, game_drawstate *ds,
         } else {
             over_hint = 1;
         }
-    } else if (x >= guess_ox &&
+    } 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;