Fix out-of-bounds error when incorporating email from stdin

[mmh] / sbr / seq_setunseen.c

diff --git a/sbr/seq_setunseen.c b/sbr/seq_setunseen.c
index b18de5d..bd57a2c 100644 (file)
--- a/sbr/seq_setunseen.c
+++ b/sbr/seq_setunseen.c
@@ -8,32 +8,38 @@
 */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /*
 ** We scan through the folder and act upon all messages
 ** that are marked with the SELECT_UNSEEN bit.
 **
-** If seen == 1, delete messages from unseen sequence.
-** If seen == 0, add messages to unseen sequence.
+** Either add messages to or (if doadd is false) delete messages from
+** the unseen sequence(s).
 */
-
 void
-seq_setunseen(struct msgs *mp, int seen)
+seq_setunseen(struct msgs *mp, int doadd)
 {
-       int msgnum;
+       int n;
        char **ap, *cp, *dp;
 
+       if (mp->lowmsg == 0) {
+               return;
+       }
+
        /*
        ** Get the list of sequences for Unseen-Sequence
        ** and split them.
        */
        if ((cp = context_find(usequence))) {
-               dp = getcpy(cp);
-               if (!(ap = brkstring(dp, " ", "\n")) || !*ap) {
-                       free(dp);
-                       return;
-               }
+               dp = mh_xstrdup(cp);
        } else {
+               /* not set in profile, thus use the default */
+               dp = mh_xstrdup(seq_unseen);
+       }
+       if (!(ap = brkstring(dp, " ", "\n")) || !*ap) {
+               /* contains no sequence name, i.e. we're finished */
+               mh_free0(&dp);
                return;
        }
 
@@ -42,18 +48,23 @@ seq_setunseen(struct msgs *mp, int seen)
        ** bit set to/from each of these sequences.
        */
        for (; *ap; ap++) {
-               if (seen) {
-                       /* make sure sequence exists first */
-                       if (seq_getnum(mp, *ap) != -1)
-                               for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
-                                       if (is_unseen(mp, msgnum))
-                                               seq_delmsg(mp, *ap, msgnum);
+               if (doadd) {
+                       for (n = mp->lowmsg; n <= mp->hghmsg; n++) {
+                               if (is_unseen(mp, n)) {
+                                       seq_addmsg(mp, *ap, n, -1, 0);
+                               }
+                       }
                } else {
-                       for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++)
-                               if (is_unseen(mp, msgnum))
-                                       seq_addmsg(mp, *ap, msgnum, -1, 0);
+                       /* make sure sequence exists first */
+                       if (seq_getnum(mp, *ap) != -1) {
+                               for (n = mp->lowsel; n <= mp->hghsel; n++) {
+                                       if (is_unseen(mp, n)) {
+                                               seq_delmsg(mp, *ap, n);
+                                       }
+                               }
+                       }
                }
        }
 
-       free(dp);
+       mh_free0(&dp);
 }