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

deserialise: use the right one of {,c}params.

Browse Source 
The serialised game stores a long-term and a short-term parameter
structure, which correspond to me->params (the thing that gets used by
the next New Game command) and me->curparams (the thing that _was_
used to generate _this_ game). So data relevant to the current game
ought to be validated against the latter, but in fact I was
accidentally passing the former to several validation calls.

I think this probably avoided causing a problem because typically
params and cparams don't differ very much: the usual reason why
they're not the same is that somebody has manually entered a game
description involving an incomplete description of the parameters
(lacking generation-specific details like difficulty level), but by
the very fact that those incomplete descriptions have to contain
_enough_ information to understand a specific game description,
copying just those parts of the description into the long-term params
structure makes the two similar enough that validation won't fail.

However, testing an upcoming patch which calls midend_deserialise at a
more difficult moment (specifically, just after midend_set_params,
meaning that the two params structures can now differ _arbitrarily_)
reveals my error. Fixed to use cparams where that's the right thing.
This commit is contained in:
Simon Tatham
2017-10-01 09:15:49 +01:00
parent aafb1b4983
commit cdf1639531
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
midend.c
View File

@ -1951,11 +1951,11 @@ char *midend_deserialise(midend *me,
if (!desc) {
ret = "Game description in save file is missing";
goto cleanup;
} else if (me->ourgame->validate_desc(params, desc)) {
} else if (me->ourgame->validate_desc(cparams, desc)) {
ret = "Game description in save file is invalid";
goto cleanup;
}
if (privdesc && me->ourgame->validate_desc(params, privdesc)) {
if (privdesc && me->ourgame->validate_desc(cparams, privdesc)) {
ret = "Game private description in save file is invalid";
goto cleanup;
}
@ -1963,7 +1963,7 @@ char *midend_deserialise(midend *me,
ret = "Game position in save file is out of range";
}
states[0].state = me->ourgame->new_game(me, params,
states[0].state = me->ourgame->new_game(me, cparams,
privdesc ? privdesc : desc);
for (i = 1; i < nstates; i++) {
assert(states[i].movetype != NEWGAME);
@ -1978,11 +1978,11 @@ char *midend_deserialise(midend *me,
}
break;
case RESTART:
if (me->ourgame->validate_desc(params, states[i].movestr)) {
if (me->ourgame->validate_desc(cparams, states[i].movestr)) {
ret = "Save file contained an invalid restart move";
goto cleanup;
}
states[i].state = me->ourgame->new_game(me, params,
states[i].state = me->ourgame->new_game(me, cparams,
states[i].movestr);
break;
}