Mercurial > hg > early-roguelike
view rogue3/list.c @ 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 | 527e2150eaf0 |
children | 0250220d8cdd |
line wrap: on
line source
/* * Functions for dealing with linked lists of goodies * * @(#)list.c 3.3 (Berkeley) 6/15/81 * * Rogue: Exploring the Dungeons of Doom * Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman * All rights reserved. * * See the file LICENSE.TXT for full copyright and licensing information. */ #include "curses.h" #include <stdlib.h> #include <string.h> #include "machdep.h" #include "rogue.h" /* * detach: * Takes an item out of whatever linked list it might be in */ void _detach(struct linked_list **list, struct linked_list *item) { if (*list == item) *list = next(item); if (prev(item) != NULL) item->l_prev->l_next = next(item); if (next(item) != NULL) item->l_next->l_prev = prev(item); item->l_next = NULL; item->l_prev = NULL; } /* * _attach: * add an item to the head of a list */ void _attach(struct linked_list **list, struct linked_list *item) { if (*list != NULL) { item->l_next = *list; (*list)->l_prev = item; item->l_prev = NULL; } else { item->l_next = NULL; item->l_prev = NULL; } *list = item; } /* * _free_list: * Throw the whole blamed thing away */ void _free_list(struct linked_list **ptr) { struct linked_list *item; while (*ptr != NULL) { item = *ptr; *ptr = next(item); discard(item); } } /* * discard: * free up an item */ void discard(struct linked_list *item) { total -= 2; FREE(item->l_data); FREE(item); } /* * new_item * get a new item with a specified size */ struct linked_list * new_item(int size) { struct linked_list *item; if ((item = (struct linked_list *) _new(sizeof *item)) == NULL) { msg("Ran out of memory for header after %d items", total); return NULL; } if ((item->l_data = _new(size)) == NULL) { msg("Ran out of memory for data after %d items", total); free(item); return NULL; } item->l_next = item->l_prev = NULL; memset(item->l_data,0,size); return item; } char * _new(size_t size) { char *space = ALLOC(size); if (space == NULL) { sprintf(prbuf, "Rogue ran out of memory (%d). Fatal error!", md_memused()); fatal(prbuf); } total++; return space; }