zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Galaxies: fix assertion failure when adding out-of-bounds association.

Browse Source 
Adding an association with an out-of-bounds square (i.e. by pressing Return
with a dot selected, and then moving the cursor so the `opposite' arrow was
off the screen) would cause space_opposite_dot() to return NULL, in turn
causing ok_to_add_assoc_with_opposite_internal() to return false, failing
the assertion.

This assertion appears to have been introduced in 68363231.
This commit is contained in:
Franklin Wei
2020-07-05 19:32:26 -04:00
committed by Simon Tatham
parent 78bc9ea7f7
commit 84cb4c6701
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
galaxies.c
View File

@ -382,12 +382,15 @@ static bool ok_to_add_assoc_with_opposite(
static void add_assoc_with_opposite(game_state *state, space *tile, space *dot) { static void add_assoc_with_opposite(game_state *state, space *tile, space *dot) {
space *opposite = space_opposite_dot(state, tile, dot); space *opposite = space_opposite_dot(state, tile, dot);
assert(ok_to_add_assoc_with_opposite_internal(state, tile, opposite)); if(opposite)
{
assert(ok_to_add_assoc_with_opposite_internal(state, tile, opposite));
remove_assoc_with_opposite(state, tile); remove_assoc_with_opposite(state, tile);
add_assoc(state, tile, dot); add_assoc(state, tile, dot);
remove_assoc_with_opposite(state, opposite); remove_assoc_with_opposite(state, opposite);
add_assoc(state, opposite, dot); add_assoc(state, opposite, dot);
}
} }
static space *sp2dot(const game_state *state, int x, int y) static space *sp2dot(const game_state *state, int x, int y)