Mercurial > hg > early-roguelike
view arogue5/list.c @ 111:7f8f43943b1f
Fix some terribly depressing corruption during restore.
In rogue5/state.c, rs_read_daemons() zeroes out the argument and delay
if the daemon slot is empty. Unfortunately that code ended up on the
wrong side of the brace that closes the for loop, so instead of running
after each daemon, it got run once after the loop exited, when the
index was of course out of bounds.
This tended to manifest, when compiled with -O2, by overwriting hw and
setting it to NULL. When inventory() next ran, hw would be passed to
wgetch(), which returns ERR when it gets a NULL argument. This made
md_readchar() think something was wrong and autosave the game.
Upon investigation, rogue3 was found to commit the same mistake.
rogue4 and srogue don't zero the data. arogue5 already does it
properly.
Someday I am going to run all this through Valgrind. Someday when I
am a kinder person who will not be driven to invoke hordes of trolls
and centaurs upon the original authors.
author | John "Elwin" Edwards |
---|---|
date | Wed, 08 Jan 2014 16:44:16 -0500 |
parents | 0ed67132cf10 |
children | 56e748983fa8 |
line wrap: on
line source
/* * Functions for dealing with linked lists of goodies * * Advanced Rogue * Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka and AT&T * All rights reserved. * * Based on "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 <stdlib.h> #include "curses.h" #include "rogue.h" /* * detach: * Takes an item out of whatever linked list it might be in */ _detach(list, item) register struct linked_list **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 */ _attach(list, item) register struct linked_list **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; } /* * o_free_list: * Throw the whole object list away */ _o_free_list(ptr) register struct linked_list **ptr; { register struct linked_list *item; while (*ptr != NULL) { item = *ptr; *ptr = next(item); o_discard(item); } } /* * o_discard: * free up an item and its object(and maybe contents) */ o_discard(item) register struct linked_list *item; { register struct object *obj; obj = OBJPTR(item); if (obj->contents != NULL) o_free_list(obj->contents); total -= 2; FREE(item->l_data); FREE(item); } /* * t_free_list: * Throw the whole thing list away */ _t_free_list(ptr) register struct linked_list **ptr; { register struct linked_list *item; while (*ptr != NULL) { item = *ptr; *ptr = next(item); t_discard(item); } } /* * t_discard: * free up an item and its thing */ t_discard(item) struct linked_list *item; { total -= 2; FREE(item->l_data); FREE(item); } /* * destroy_item: * get rid of an item structure -- don't worry about contents */ destroy_item(item) register struct linked_list *item; { total--; FREE(item); } /* * new_item * get a new item with a specified size */ struct linked_list * new_item(size) int size; { register struct linked_list *item; if ((item = (struct linked_list *) new(sizeof *item)) == NULL) msg("Ran out of memory for header after %d items", total); if ((item->l_data = new(size)) == NULL) msg("Ran out of memory for data after %d items", total); item->l_next = item->l_prev = NULL; return item; } /* * creat_item: * Create just an item structure -- don't make any contents */ struct linked_list * creat_item() { register struct linked_list *item; if ((item = (struct linked_list *) new(sizeof *item)) == NULL) msg("Ran out of memory for header after %d items", total); item->l_next = item->l_prev = NULL; return item; } char * new(size) int size; { register char *space = ALLOC(size); static char errbuf[LINELEN]; if (space == NULL) { sprintf(errbuf,"Rogue ran out of memory (used = %d, wanted = %d).", md_memused(), size); fatal(errbuf); } total++; return space; }