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

Properly handle invalid room references in savefiles.

Browse source 
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.
This commit is contained in:
John "Elwin" Edwards 2013-08-08 12:41:35 -07:00
parent a210387f8d
commit e375c8bd05
5 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arogue5/state.c
View file

@ -1661,7 +1661,10 @@ rs_read_room_reference(int inf, struct room **rp)
rs_read_int(inf, &i);
*rp = &rooms[i];
if (i >= 0 && i < MAXROOMS)
*rp = &rooms[i];
else
*rp = NULL;
return(READSTAT);
}

8
rogue3/state.c
View file

@ -765,8 +765,12 @@ rs_read_room_reference(FILE *savef, struct room **rp)
rs_read_int(savef, &i);
if (!encerror())
*rp = &rooms[i];
if (!encerror()) {
if (i >= 0 && i < MAXROOMS)
*rp = &rooms[i];
else
*rp = NULL;
}
}
void

13
rogue4/state.c
View file

@ -1212,7 +1212,10 @@ rs_read_room_reference(int inf, struct room **rp)
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 @@ int
rs_restore_file(int inf)
{
bool junk;
THING *mitem;
int endian = 0x01020304;
big_endian = ( *((char *)&endian) == 0x01 );
@ -2156,6 +2160,13 @@ rs_restore_file(int inf)
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);
}

16
rogue5/state.c
View file

@ -804,8 +804,12 @@ rs_read_room_reference(FILE *savef, struct room **rp)
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 @@ rs_save_file(FILE *savef)
int
rs_restore_file(FILE *savef)
{
THING *mitem;
encclearerr();
rs_read_int(savef, &noscore);
@ -1446,5 +1451,12 @@ rs_restore_file(FILE *savef)
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() );
}

5
srogue/state.c
View file

@ -1128,7 +1128,10 @@ rs_read_room_reference(int inf, struct room **rp)
rs_read_int(inf, &i);
*rp = &rooms[i];
if (i >= 0 && i < MAXROOMS)
*rp = &rooms[i];
else
*rp = NULL;
return(READSTAT);
}