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

Palisade: explicitly use 'signed char' for clues.

Browse Source 
Previously, the typedef 'clue' was just 'char', but it was used in the
expectation that it would be signed. So on platforms that default to
unsigned char, such as 32-bit Arm, Palisade would completely fail to
function correctly.
This commit is contained in:
Simon Tatham
2021-12-11 11:09:29 +00:00
parent 3e00615845
commit 9339cff533
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
palisade.c
View File

@ -46,7 +46,7 @@ struct game_params {
int w, h, k; int w, h, k;
}; };
typedef char clue; typedef signed char clue;
typedef unsigned char borderflag; typedef unsigned char borderflag;
typedef struct shared_state { typedef struct shared_state {
@ -622,7 +622,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
{ {
int w = params->w, h = params->h, wh = w*h, k = params->k; int w = params->w, h = params->h, wh = w*h, k = params->k;
clue *numbers = snewn(wh + 1, clue), *p; clue *numbers = snewn(wh + 1, clue);
borderflag *rim = snewn(wh, borderflag); borderflag *rim = snewn(wh, borderflag);
borderflag *scratch_borders = snewn(wh, borderflag); borderflag *scratch_borders = snewn(wh, borderflag);
@ -682,7 +682,8 @@ static char *new_game_desc(const game_params *params, random_state *rs,
sfree(shuf); sfree(shuf);
sfree(dsf); sfree(dsf);
p = numbers; char *output = snewn(wh + 1, char), *p = output;
r = 0; r = 0;
for (i = 0; i < wh; ++i) { for (i = 0; i < wh; ++i) {
if (numbers[i] != EMPTY) { if (numbers[i] != EMPTY) {
@ -699,7 +700,8 @@ static char *new_game_desc(const game_params *params, random_state *rs,
} }
*p++ = '\0'; *p++ = '\0';
return sresize(numbers, p - numbers, clue); sfree(numbers);
return sresize(output, p - output, char);
} }
static const char *validate_desc(const game_params *params, const char *desc) static const char *validate_desc(const game_params *params, const char *desc)