From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 25 Jun 2017 17:17:35 +0000 (-0400)
Subject: Dix off-by-one errors induced by tightening some array bounds.
X-Git-Tag: 1.1~120
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=d8099744796d5ca1a80b2db5be6374cc8db830d0;p=open-adventure.git

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

diff --git a/init.c b/init.c
index 03a574f..194abe3 100644
--- a/init.c
+++ b/init.c
@@ -38,11 +38,10 @@ void initialise(void)
      *  This also sets up "game.place" and "fixed" as copies of "PLAC" and
      *  "FIXD".  Also, since two-placed objects are typically best
      *  described last, we'll drop them first. */
-    for (int i = 1; i <= NOBJECTS; i++) {
-        int k = NOBJECTS + 1 - i;
-        if (object_descriptions[k].fixd > 0) {
-            DROP(k + NOBJECTS, object_descriptions[k].fixd);
-            DROP(k, object_descriptions[k].plac);
+    for (int i = NOBJECTS; i >= 1; i--) {
+        if (object_descriptions[i].fixd > 0) {
+            DROP(i + NOBJECTS, object_descriptions[i].fixd);
+            DROP(i, object_descriptions[i].plac);
         }
     }
 
diff --git a/newdungeon.py b/newdungeon.py
index 28c7b63..39998e7 100755
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -221,7 +221,7 @@ def get_turn_thresholds(trn):
     return trn_str
 
 def get_locations(loc):
-    template = """    {{
+    template = """    {{ // {}
         .description = {{
             .small = {},
             .big = {},
@@ -231,17 +231,17 @@ def get_locations(loc):
     }},
 """
     loc_str = ""
-    for item in loc:
+    for (i, item) in enumerate(loc):
         short_d = make_c_string(item[1]["description"]["short"])
         long_d = make_c_string(item[1]["description"]["long"])
         sound = item[1].get("sound", "SILENT")
         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
     return loc_str
 
 def get_object_descriptions(obj):
-    template = """    {{
+    template = """    {{ // {}
         .inventory = {},
         .plac = {},
         .fixd = {},
@@ -258,7 +258,7 @@ def get_object_descriptions(obj):
     }},
 """
     obj_str = ""
-    for item in obj:
+    for (i, item) in enumerate(obj):
         attr = item[1]
         i_msg = make_c_string(attr["inventory"])
         longs_str = ""
@@ -305,7 +305,7 @@ def get_object_descriptions(obj):
             sys.stderr.write("dungeon: unknown object location in %s\n" % locs)
             sys.exit(1)
         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
     return obj_str
 
@@ -397,8 +397,8 @@ if __name__ == "__main__":
     )
 
     h = h_template.format(
-        len(db["locations"]),
-        len(db["object_descriptions"]),
+        len(db["locations"])-1,
+        len(db["object_descriptions"])-1,
         len(db["hints"]),
         len(db["classes"]),
         len(db["obituaries"]),