Mercurial > hg > early-roguelike
changeset 83:09db0cf536af
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.
| author | John "Elwin" Edwards |
|---|---|
| date | Thu, 08 Aug 2013 12:41:35 -0700 |
| parents | f11eeafc6568 |
| children | a0d4caead33b |
| files | arogue5/state.c rogue3/state.c rogue4/state.c rogue5/state.c srogue/state.c |
| diffstat | 5 files changed, 40 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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); }
--- 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
--- 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); }
--- 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() ); }