archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dix off-by-one errors induced by tightening some array bounds.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-25 13:17:35 -04:00
parent 8a3757df59
commit d809974479
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
init.c
View file

@ -38,11 +38,10 @@ void initialise(void)
* This also sets up "game.place" and "fixed" as copies of "PLAC" and * This also sets up "game.place" and "fixed" as copies of "PLAC" and
* "FIXD". Also, since two-placed objects are typically best * "FIXD". Also, since two-placed objects are typically best
* described last, we'll drop them first. */ * described last, we'll drop them first. */
for (int i = 1; i <= NOBJECTS; i++) { for (int i = NOBJECTS; i >= 1; i--) {
int k = NOBJECTS + 1 - i; if (object_descriptions[i].fixd > 0) {
if (object_descriptions[k].fixd > 0) { DROP(i + NOBJECTS, object_descriptions[i].fixd);
DROP(k + NOBJECTS, object_descriptions[k].fixd); DROP(i, object_descriptions[i].plac);
DROP(k, object_descriptions[k].plac);
} }
} }

16
newdungeon.py
View file

@ -221,7 +221,7 @@ def get_turn_thresholds(trn):
return trn_str return trn_str
def get_locations(loc): def get_locations(loc):
template = """ {{ template = """ {{ // {}
.description = {{ .description = {{
.small = {}, .small = {},
.big = {}, .big = {},
@ -231,17 +231,17 @@ def get_locations(loc):
}}, }},
""" """
loc_str = "" loc_str = ""
for item in loc: for (i, item) in enumerate(loc):
short_d = make_c_string(item[1]["description"]["short"]) short_d = make_c_string(item[1]["description"]["short"])
long_d = make_c_string(item[1]["description"]["long"]) long_d = make_c_string(item[1]["description"]["long"])
sound = item[1].get("sound", "SILENT") sound = item[1].get("sound", "SILENT")
loud = "true" if item[1].get("loud") else "false" loud = "true" if item[1].get("loud") else "false"
loc_str += template.format(short_d, long_d, sound, loud) loc_str += template.format(i, short_d, long_d, sound, loud)
loc_str = loc_str[:-1] # trim trailing newline loc_str = loc_str[:-1] # trim trailing newline
return loc_str return loc_str
def get_object_descriptions(obj): def get_object_descriptions(obj):
template = """ {{ template = """ {{ // {}
.inventory = {}, .inventory = {},
.plac = {}, .plac = {},
.fixd = {}, .fixd = {},
@ -258,7 +258,7 @@ def get_object_descriptions(obj):
}}, }},
""" """
obj_str = "" obj_str = ""
for item in obj: for (i, item) in enumerate(obj):
attr = item[1] attr = item[1]
i_msg = make_c_string(attr["inventory"]) i_msg = make_c_string(attr["inventory"])
longs_str = "" longs_str = ""
@ -305,7 +305,7 @@ def get_object_descriptions(obj):
sys.stderr.write("dungeon: unknown object location in %s\n" % locs) sys.stderr.write("dungeon: unknown object location in %s\n" % locs)
sys.exit(1) sys.exit(1)
treasure = "true" if attr.get("treasure") else "false" treasure = "true" if attr.get("treasure") else "false"
obj_str += template.format(i_msg, locs[0], locs[1], treasure, longs_str, sounds_str, texts_str) obj_str += template.format(i, i_msg, locs[0], locs[1], treasure, longs_str, sounds_str, texts_str)
obj_str = obj_str[:-1] # trim trailing newline obj_str = obj_str[:-1] # trim trailing newline
return obj_str return obj_str
@ -397,8 +397,8 @@ if __name__ == "__main__":
) )
h = h_template.format( h = h_template.format(
len(db["locations"]), len(db["locations"])-1,
len(db["object_descriptions"]), len(db["object_descriptions"])-1,
len(db["hints"]), len(db["hints"]),
len(db["classes"]), len(db["classes"]),
len(db["obituaries"]), len(db["obituaries"]),