From 46568d24a4313266be43babd979e6fd3fd9d317e Mon Sep 17 00:00:00 2001 From: "John \"Elwin\" Edwards" Date: Mon, 6 Jan 2014 15:57:17 -0500 Subject: [PATCH] arogue5: fix some save/restore-related crashes. 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. --- arogue5/state.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arogue5/state.c b/arogue5/state.c index f5fdb43..648d65c 100644 --- a/arogue5/state.c +++ b/arogue5/state.c @@ -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)