# HG changeset patch
# User John "Elwin" Edwards
# Date 1375990895 25200
# Node ID 09db0cf536af48380aeb3dbf506c642b6380fba0
# Parent  f11eeafc656802738f7421b34a57478c7e143ce8
Properly handle invalid room references in savefiles.

In all games, rs_write_room_reference() stored -1 for a nonexistent
room, but rs_read_room_reference() did not check for out-of-bounds
values, leading to pointers to rooms[-1], which sometimes caused
crashes.  rs_read_room_reference() has now been modified to use NULL
instead.

Some of the games required further changes to replace NULL with the
pointer to the actual room.  Others are capable of handling NULL for
objects not in any room.

diff -r f11eeafc6568 -r 09db0cf536af arogue5/state.c
--- a/arogue5/state.c	Tue Aug 06 19:02:58 2013 -0700
+++ b/arogue5/state.c	Thu Aug 08 12:41:35 2013 -0700
@@ -1661,7 +1661,10 @@
 
     rs_read_int(inf, &i);
 
-    *rp = &rooms[i];
+    if (i >= 0 && i < MAXROOMS)
+        *rp = &rooms[i];
+    else
+        *rp = NULL;
             
     return(READSTAT);
 }
diff -r f11eeafc6568 -r 09db0cf536af rogue3/state.c
--- a/rogue3/state.c	Tue Aug 06 19:02:58 2013 -0700
+++ b/rogue3/state.c	Thu Aug 08 12:41:35 2013 -0700
@@ -765,8 +765,12 @@
     
     rs_read_int(savef, &i);
 
-    if (!encerror())
-        *rp = &rooms[i];
+    if (!encerror()) {
+        if (i >= 0 && i < MAXROOMS)
+            *rp = &rooms[i];
+        else
+            *rp = NULL;
+    }
 }
 
 void
diff -r f11eeafc6568 -r 09db0cf536af rogue4/state.c
--- a/rogue4/state.c	Tue Aug 06 19:02:58 2013 -0700
+++ b/rogue4/state.c	Thu Aug 08 12:41:35 2013 -0700
@@ -1212,7 +1212,10 @@
     
     rs_read_int(inf, &i);
 
-    *rp = &rooms[i];
+    if (i >= 0 && i < MAXROOMS)
+        *rp = &rooms[i];
+    else
+        *rp = NULL;
             
     return(READSTAT);
 }
@@ -2060,6 +2063,7 @@
 rs_restore_file(int inf)
 {
     bool junk;
+    THING *mitem;
     int endian = 0x01020304;
     big_endian = ( *((char *)&endian) == 0x01 );
     
@@ -2156,6 +2160,13 @@
     rs_read(inf, wand_mons, sizeof(wand_mons));         /* 5.2-monsters.c   */
     rs_read_coord(inf, &nh);                            /* 5.2-move.c       */
     rs_read_boolean(inf, &got_genocide);                /* 5.2-things.c     */
+
+    if (proom == NULL)
+        proom = roomin(&hero);
+    for (mitem = mlist; mitem != NULL; mitem = mitem->l_next) {
+        if (mitem->t_room == NULL)
+            mitem->t_room = roomin(&(mitem->t_pos));
+    }
     
     return(READSTAT);
 }
diff -r f11eeafc6568 -r 09db0cf536af rogue5/state.c
--- a/rogue5/state.c	Tue Aug 06 19:02:58 2013 -0700
+++ b/rogue5/state.c	Thu Aug 08 12:41:35 2013 -0700
@@ -804,8 +804,12 @@
     
     rs_read_int(savef, &i);
 
-    if (!encerror())
-	*rp = &rooms[i];
+    if (!encerror()) {
+        if (i >= 0 && i < MAXROOMS)
+	    *rp = &rooms[i];
+        else
+            *rp = NULL;
+    }
 }
 
 void
@@ -1384,6 +1388,7 @@
 int
 rs_restore_file(FILE *savef)
 {
+    THING *mitem;
     encclearerr();
 
     rs_read_int(savef, &noscore);
@@ -1446,5 +1451,12 @@
     rs_read_int(savef,&group);
     rs_read_window(savef,stdscr);
 
+    if (player.t_room == NULL)
+        player.t_room = roomin(&hero);
+    for (mitem = mlist; mitem != NULL; mitem = mitem->l_next) {
+        if (mitem->t_room == NULL)
+            mitem->t_room = roomin(&(mitem->t_pos));
+    }
+
     return( encclearerr() );
 }
diff -r f11eeafc6568 -r 09db0cf536af srogue/state.c
--- a/srogue/state.c	Tue Aug 06 19:02:58 2013 -0700
+++ b/srogue/state.c	Thu Aug 08 12:41:35 2013 -0700
@@ -1128,7 +1128,10 @@
     
     rs_read_int(inf, &i);
 
-    *rp = &rooms[i];
+    if (i >= 0 && i < MAXROOMS)
+        *rp = &rooms[i];
+    else
+        *rp = NULL;
             
     return(READSTAT);
 }