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

Fix return value from newgame_undo_deserialise_read.

Browse Source 
The read function used by midend_deserialise and friends is expected
never to perform a partial read (the main deserialisation code always
knows how many bytes it can expect to see), so it's specified to
return simply TRUE or FALSE for success/failure, rather than the
number of bytes read.

This probably wasn't breaking anything, since in the case of
deserialising from an internal memory buffer a short read could only
arise due to an outright bug constructing the buffer. But now I've
spotted it, I should fix it.
This commit is contained in:
Simon Tatham
2018-06-21 19:02:21 +01:00
parent 3618f6a07f
commit 1d9cf25f27
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
midend.c
View File

@ -564,10 +564,12 @@ static int newgame_undo_deserialise_read(void *ctx, void *buf, int len)
{ {
struct newgame_undo_deserialise_read_ctx *const rctx = ctx; struct newgame_undo_deserialise_read_ctx *const rctx = ctx;
int use = min(len, rctx->len - rctx->pos); if (len > rctx->len - rctx->pos)
memcpy(buf, rctx->ser->buf + rctx->pos, use); return FALSE;
rctx->pos += use;
return use; memcpy(buf, rctx->ser->buf + rctx->pos, len);
rctx->pos += len;
return TRUE;
} }
struct newgame_undo_deserialise_check_ctx { struct newgame_undo_deserialise_check_ctx {