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

Pattern: fix three bugs in game_text_format.

Browse Source 
A user reported that, on the default square board size, the clues were
printed in the right places, but the grid contents were accidentally
transposed by swapping the x and y coordinates. Oops!

Trying to reproduce this, my dev build was running under ASan, which
pointed out two further buffer handling bugs. The initial sprintf put
the terminating NUL one char too early in the buffer, so that it was
overwritten by the bottom right corner of the grid and no NUL ended up
in the buffer at all; also, the separate buffer for formatting numeric
clues in the left margin was sized one char too short, because the NUL
at the end of it hadn't been counted. Apparently in a non-ASan
environment both of those could work anyway by chance.
This commit is contained in:
Simon Tatham
2024-09-27 22:28:57 +01:00
parent a9601a678a
commit 182b3d9e27
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pattern.c
View File

@ -1180,7 +1180,8 @@ static char *game_text_format(const game_state *state)
topleft = lw * top_gap + left_gap;
board = snewn(len + 1, char);
sprintf(board, "%*s\n", len - 2, "");
memset(board, ' ', len);
board[len] = '\0';
for (i = 0; i < lh; ++i) {
board[lw - 1 + i*lw] = '\n';
@ -1197,7 +1198,7 @@ static char *game_text_format(const game_state *state)
}
}
buf = snewn(left_gap, char);
buf = snewn(left_gap + 1, char);
for (i = 0; i < h; ++i) {
char *p = buf, *start = board + top_gap*lw + left_gap + (i*ch+1)*lw;
for (j = 0; j < state->common->rowlen[i+w]; ++j) {
@ -1207,9 +1208,9 @@ static char *game_text_format(const game_state *state)
memcpy(start - (p - buf), buf, p - buf);
}
for (i = 0; i < w; ++i) {
for (j = 0; j < h; ++j) {
int cell = topleft + i*cw + j*ch*lw;
for (i = 0; i < h; ++i) {
for (j = 0; j < w; ++j) {
int cell = topleft + j*cw + i*ch*lw;
int center = cell + cw/2 + (ch/2)*lw;
int dx, dy;
board[cell] = false ? center : '+';
@ -1227,6 +1228,7 @@ static char *game_text_format(const game_state *state)
sfree(buf);
assert(board[len] == '\0' && "Overwrote the NUL");
return board;
}