changeset 110:5f51f7d9805f

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.
author John "Elwin" Edwards
date Mon, 06 Jan 2014 15:57:17 -0500
parents ec9db3bb6b0b
children 7f8f43943b1f
files arogue5/state.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/arogue5/state.c	Mon Sep 09 07:58:47 2013 -0400
+++ b/arogue5/state.c	Mon Jan 06 15:57:17 2014 -0500
@@ -641,7 +641,10 @@
         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_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)