Merge branch 'legacy_63'

[~andy/fetchmail] / sink.c

diff --git a/sink.c b/sink.c
index eb1bbd40beae04a90abc9171df8bd274f775f1f7..5e9bef9864eb80f6ae3bac880a33b582be8a1e55 100644 (file)
--- a/sink.c
+++ b/sink.c
@@ -1089,9 +1089,9 @@ static int open_mda_sink(struct query *ctl, struct msgblk *msg,
         */
        nameslen = 0;
        for (idp = msg->recipients; idp; idp = idp->next)
-           if ((idp->val.status.mark == XMIT_ACCEPT))
+           if (idp->val.status.mark == XMIT_ACCEPT)
                nameslen += (strlen(idp->id) + 1);      /* string + ' ' */
-       if ((*good_addresses == 0))
+       if (*good_addresses == 0)
            nameslen = strlen(run.postmaster);
 
        names = (char *)xmalloc(nameslen + 1);  /* account for '\0' */
@@ -1150,6 +1150,16 @@ static int open_mda_sink(struct query *ctl, struct msgblk *msg,
        for (dp = after, sp = before; (*dp = *sp); dp++, sp++) {
            if (sp[0] != '%')   continue;
 
+           if (sp > before && sp[-1] == '\'') {
+               report(stderr, GT_("MDA option contains single-quoted %%%c expansion.\n"), sp[1]);
+               report(stderr, GT_("Refusing to deliver. Check the manual and fix your mda option.\n"));
+               free(before);
+               free(after);
+               if (from) free(from);
+               if (names) free(names);
+               return PS_SYNTAX;
+           }
+
            /* need to expand? BTW, no here overflow, because in
            ** the worst case (end of string) sp[1] == '\0' */
            if (sp[1] == 's' || sp[1] == 'T') {