warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arogue5: fix some save/restore-related crashes.

Browse source 
The save/restore code took the pointer intended as an argument for the
doctor() daemon and wrote it to the savefile as an int.  I don't know
why it took so long to fail horribly.  The problem has been avoided by
replacing the value with &player when restoring.  That seems to be the
only argument ever actually used.

The code also writes only four bytes for an unsigned long; if
sizeof(long) == 8, it casts to unsigned int first.  It failed to do the
cast when reading back, with the result that four bytes were read and
the other half of the number was effectively uninitialized.

It apparently works now, but the save/restore code ought still to be
regarded as decidedly unfortunate.
This commit is contained in:
John "Elwin" Edwards 2014-01-06 15:57:17 -05:00
parent 0f998b01ad
commit 46568d24a4
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
arogue5/state.c
View file

@ -641,7 +641,10 @@ rs_read_ulong(int inf, unsigned long *i)
buf = bytes;
}
*i = *((unsigned long *) buf);
if ( (sizeof(long) == 8) && (sizeof(int) == 4) )
*i = *((unsigned int *) buf);
else
*i = *((unsigned long *) buf);
return(READSTAT);
}
@ -1515,6 +1518,8 @@ rs_read_daemons(int inf, struct delayed_action *d_list, int count)
}
rs_read_int(inf, &d_list[i].d_arg);
if (func == 2)
d_list[i].d_arg = &player;
rs_read_int(inf, &d_list[i].d_time);
if (d_list[i].d_func == NULL)