X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=saveresume.c;h=bbd13761f17e7a51eab80159b24aea135e32166c;hp=e4d9959aeaa59e460f99bbc11fc30fcbedfd2426;hb=876fbb2f78bc63b3c99091ab658042f578b3df35;hpb=aeaa0400cb39846bce3e7abe4566a6c9566e39a4

diff --git a/saveresume.c b/saveresume.c
index e4d9959..bbd1376 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -1,17 +1,24 @@
+/*
+ * Saving and resuming.
+ *
+ * (ESR) This replaces  a bunch of particularly nasty FORTRAN-derived code;
+ * see the history.adoc file in the source distribution for discussion.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+
 #include <stdlib.h>
 #include <string.h>
 #include <editline/readline.h>
 #include <time.h>
+#include <inttypes.h>
 
 #include "advent.h"
 #include "dungeon.h"
 
-/*
- * (ESR) This replaces  a bunch of particularly nasty FORTRAN-derived code;
- * see the history.adoc file in the source distribution for discussion.
- */
-
-#define VRSION	27	/* bump on save format change */
+#define VRSION	28	/* bump on save format change */
 
 /*
  * If you change the first three members, the resume function may not properly
@@ -20,16 +27,16 @@
  * when you do that.
  */
 struct save_t {
-    long savetime;
-    long mode;		/* not used, must be present for version detection */
-    long version;
+    int64_t savetime;
+    int32_t mode;		/* not used, must be present for version detection */
+    int32_t version;
     struct game_t game;
 };
 struct save_t save;
 
 #define IGNORE(r) do{if (r){}}while(0)
 
-int savefile(FILE *fp, long version)
+int savefile(FILE *fp, int32_t version)
 /* Save game to file. No input or output from user. */
 {
     save.savetime = time(NULL);
@@ -105,8 +112,6 @@ int resume(void)
     return restore(fp);
 }
 
-bool is_valid(struct game_t);
-
 int restore(FILE* fp)
 {
     /*  Read and restore game state from file, assuming
@@ -134,18 +139,31 @@ bool is_valid(struct game_t valgame)
      *  valid: no states are outside minimal or maximal value
      */
 
-    /*  Bounds check for locations
-     */
-    if ( valgame.chloc < -1  || valgame.chloc > NLOCATIONS  ||
-         valgame.chloc < -1  || valgame.chloc > NLOCATIONS  ||
-         valgame.loc < -1    || valgame.loc > NLOCATIONS    ||
-         valgame.newloc < -1 || valgame.newloc > NLOCATIONS ||
-         valgame.oldloc < -1 || valgame.oldloc > NLOCATIONS ||
-         valgame.oldloc < -1 || valgame.oldloc > NLOCATIONS) {
+    /* Prevent division by zero */
+    if (valgame.abbnum == 0) {
         return false;
     }
-    /*  Bounds check for location arrays
-     */
+
+    /* Check for RNG overflow. Truncate */
+    if (valgame.lcg_x >= LCG_M) {
+        valgame.lcg_x %= LCG_M;
+    }
+
+    /* Check for RNG underflow. Transpose */
+    if (valgame.lcg_x < LCG_M) {
+        valgame.lcg_x = LCG_M + (valgame.lcg_x % LCG_M);
+    }
+
+    /*  Bounds check for locations */
+    if ( valgame.chloc  < -1 || valgame.chloc  > NLOCATIONS ||
+         valgame.chloc2 < -1 || valgame.chloc2 > NLOCATIONS ||
+         valgame.loc    <  0 || valgame.loc    > NLOCATIONS ||
+         valgame.newloc <  0 || valgame.newloc > NLOCATIONS ||
+         valgame.oldloc <  0 || valgame.oldloc > NLOCATIONS ||
+         valgame.oldlc2 <  0 || valgame.oldlc2 > NLOCATIONS) {
+        return false;
+    }
+    /*  Bounds check for location arrays */
     for (int i = 0; i <= NDWARVES; i++) {
         if (valgame.dloc[i]  < -1 || valgame.dloc[i]  > NLOCATIONS  ||
             valgame.odloc[i] < -1 || valgame.odloc[i] > NLOCATIONS) {
@@ -162,7 +180,7 @@ bool is_valid(struct game_t valgame)
 
     /*  Bounds check for dwarves */
     if (valgame.dtotal < 0 || valgame.dtotal > NDWARVES ||
-        valgame.dkill < 0 || valgame.dkill > NDWARVES) {
+        valgame.dkill < 0  || valgame.dkill  > NDWARVES) {
         return false;
     }
 
@@ -185,7 +203,7 @@ bool is_valid(struct game_t valgame)
     }
 
     /* Check that properties of objects aren't beyond expected */
-    for (int obj = 0; obj <= NOBJECTS; obj++) {
+    for (obj_t obj = 0; obj <= NOBJECTS; obj++) {
         if (valgame.prop[obj] < STATE_NOTFOUND || valgame.prop[obj] > 1) {
             switch (obj) {
             case RUG:
@@ -201,18 +219,25 @@ bool is_valid(struct game_t valgame)
             case CHAIN:
                 if (valgame.prop[obj] == 2) // There are multiple different states, but it's convenient to clump them together
                     continue;
+            /* FALLTHRU */
             case BEAR:
-                if (valgame.prop[BEAR] == CONTENTED_BEAR || game.prop[BEAR] == BEAR_DEAD)
+                if (valgame.prop[BEAR] == CONTENTED_BEAR || valgame.prop[BEAR] == BEAR_DEAD)
                     continue;
+            /* FALLTHRU */
             default:
                 return false;
             }
         }
     }
 
-    /* Check that we have objects at locations */
+    /* Check that values in linked lists for objects in locations are inside bounds */
     for (loc_t loc = LOC_NOWHERE; loc <= NLOCATIONS; loc++) {
-        if (valgame.atloc[loc] < NO_OBJECT || valgame.atloc[loc] > NLOCATIONS) {
+        if (valgame.atloc[loc] < NO_OBJECT || valgame.atloc[loc] > NOBJECTS * 2) {
+            return false;
+        }
+    }
+    for (obj_t obj = 0; obj <= NOBJECTS * 2; obj++ ) {
+        if (valgame.link[obj] < NO_OBJECT || valgame.link[obj] > NOBJECTS * 2) {
             return false;
         }
     }
@@ -220,4 +245,4 @@ bool is_valid(struct game_t valgame)
     return true;
 }
 
-/* end */
\ No newline at end of file
+/* end */