Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2025-12-23 02:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Crash occuring from invalid objects in player object files

Browse source
This commit is contained in:
Fizban 2010-03-18 02:33:03 +00:00
parent 80083e16c0
commit 972f6ce2af
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -36,6 +36,8 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
(lots of major bugfixes too) (lots of major bugfixes too)
@ @
tbaMUD 3.61 tbaMUD 3.61
[Mar 17 2010] - Fizban
Made non-existant objects in pfiles be skipped instead of crashing the MUD (thanks drefs)
[Feb 13 2010] - Rumble [Feb 13 2010] - Rumble
Removed delete object option in oedit menu. Removed delete object option in oedit menu.
[Feb 08 2010] - Rumble [Feb 08 2010] - Rumble

4
src/objsave.c
View file

@ -1025,6 +1025,10 @@ obj_save_data *objsave_parse_objects(FILE *fl)
if (*line == '#') { if (*line == '#') {
/* check for false alarm. */ /* check for false alarm. */
if (sscanf(line, "#%d", &nr) == 1) { if (sscanf(line, "#%d", &nr) == 1) {
if (real_object(nr) == NOTHING) { //object does not exist
log("SYSERR: Protection: deleting object %d.", nr);
continue;
}
if (temp) { if (temp) {
current->obj = temp; current->obj = temp;
CREATE(current->next, obj_save_data, 1); CREATE(current->next, obj_save_data, 1);