X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/892a81dbb7c632d80fb528609f5abbd3b7ba43c6..52ed4ac3f6a9271d60e66f79b1b682fb83bc8bd2:/sbr/folder_read.c

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index 4a9f7fba..73ffe431 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -124,6 +124,16 @@ folder_read (char *name, int lockflag)
     /* for testing, allocate minimal necessary space */
     /* mp->hghoff = max (mp->hghmsg, 1); */
 
+    /*
+     * If for some reason hghoff < lowoff (like we got an integer overflow)
+     * the complain about this now.
+     */
+
+    if (mp->hghoff < mp->lowoff) {
+	adios(NULL, "Internal failure: high message limit < low message "
+	      "limit; possible overflow?");
+    }
+
     /*
      * Allocate space for status of each message.
      */
@@ -155,7 +165,15 @@ folder_read (char *name, int lockflag)
     /*
      * Read and initialize the sequence information.
      */
-    seq_read (mp, lockflag);
+    if (seq_read (mp, lockflag) == NOTOK) {
+        char seqfile[PATH_MAX];
+
+        /* Failed to lock sequence file. */
+        snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
+        advise (seqfile, "failed to lock");
+
+        return NULL;
+    }
 
     return mp;
 }