Move notifier socket to general availability

[exim.git] / src / src / sieve.c

diff --git a/src/src/sieve.c b/src/src/sieve.c
index f4ce58402f5e7f7a32e39bd93dff6b24c7f54316..5e8d1e6f47760c6a92c748e574208ad7eb48df65 100644 (file)
--- a/src/src/sieve.c
+++ b/src/src/sieve.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) Michael Haardt 2003 - 2015
 *************************************************/
 
 /* Copyright (c) Michael Haardt 2003 - 2015

- * Copyright (c) The Exim Maintainers 2017
+ * Copyright (c) The Exim Maintainers 2016 - 2018

  * See the file NOTICE for conditions of use and distribution.
  */
 
  * See the file NOTICE for conditions of use and distribution.
  */
 


@@ -21,7 +21,7 @@
 #include "exim.h"
 
 #if HAVE_ICONV
 #include "exim.h"
 
 #if HAVE_ICONV

-#include <iconv.h>
+# include <iconv.h>

 #endif
 
 /* Define this for RFC compliant \r\n end-of-line terminators.      */
 #endif
 
 /* Define this for RFC compliant \r\n end-of-line terminators.      */


@@ -153,8 +153,10 @@ static uschar str_cc_c[]="Cc";
 static const struct String str_cc={ str_cc_c, 2 };
 static uschar str_bcc_c[]="Bcc";
 static const struct String str_bcc={ str_bcc_c, 3 };
 static const struct String str_cc={ str_cc_c, 2 };
 static uschar str_bcc_c[]="Bcc";
 static const struct String str_bcc={ str_bcc_c, 3 };

+#ifdef ENVELOPE_AUTH

 static uschar str_auth_c[]="auth";
 static const struct String str_auth={ str_auth_c, 4 };
 static uschar str_auth_c[]="auth";
 static const struct String str_auth={ str_auth_c, 4 };

+#endif

 static uschar str_sender_c[]="Sender";
 static const struct String str_sender={ str_sender_c, 6 };
 static uschar str_resent_from_c[]="Resent-From";
 static uschar str_sender_c[]="Sender";
 static const struct String str_sender={ str_sender_c, 6 };
 static uschar str_resent_from_c[]="Resent-From";


@@ -226,10 +228,9 @@ Returns
   dst
 */
 
   dst
 */
 

-static struct String *quoted_printable_encode(const struct String *src, struct String *dst)
+static struct String *
+quoted_printable_encode(const struct String *src, struct String *dst)

 {
 {

-int pass;
-const uschar *start,*end;

 uschar *new = NULL;
 uschar ch;
 size_t line;
 uschar *new = NULL;
 uschar ch;
 size_t line;


@@ -237,17 +238,18 @@ size_t line;
 /* Two passes: one to count output allocation size, second
 to do the encoding */
 
 /* Two passes: one to count output allocation size, second
 to do the encoding */
 

-for (pass=0; pass<=1; ++pass)
+for (int pass = 0; pass <= 1; pass++)

   {
   line=0;
   if (pass==0)
     dst->length=0;
   else
     {
   {
   line=0;
   if (pass==0)
     dst->length=0;
   else
     {

-    dst->character=store_get(dst->length+1); /* plus one for \0 */
+    dst->character = store_get(dst->length+1, is_tainted(src->character)); /* plus one for \0 */

     new=dst->character;
     }
     new=dst->character;
     }

-  for (start=src->character,end=start+src->length; start<end; ++start)
+  for (const uschar * start = src->character, * end = start + src->length;
+       start < end; ++start)

     {
     ch=*start;
     if (line>=73)      /* line length limit */
     {
     ch=*start;
     if (line>=73)      /* line length limit */


@@ -357,13 +359,13 @@ Returns
 */
 
 #ifdef ENOTIFY
 */
 
 #ifdef ENOTIFY

-static int uri_decode(struct String *str)
+static int
+uri_decode(struct String *str)

 {
 uschar *s,*t,*e;
 
 if (str->length==0) return 0;
 for (s=str->character,t=s,e=s+str->length; s<e; )
 {
 uschar *s,*t,*e;
 
 if (str->length==0) return 0;
 for (s=str->character,t=s,e=s+str->length; s<e; )

-  {

   if (*s=='%')
     {
     if (s+2<e && isxdigit(*(s+1)) && isxdigit(*(s+2)))
   if (*s=='%')
     {
     if (s+2<e && isxdigit(*(s+1)) && isxdigit(*(s+2)))


@@ -376,7 +378,7 @@ for (s=str->character,t=s,e=s+str->length; s<e; )
     }
   else
     *t++=*s++;
     }
   else
     *t++=*s++;

-  }
+

 *t='\0';
 str->length=t-str->character;
 return 0;
 *t='\0';
 str->length=t-str->character;
 return 0;


@@ -442,9 +444,9 @@ if (*uri && *uri!='?')
         filter->errmsg=US"Invalid URI encoding";
         return -1;
         }
         filter->errmsg=US"Invalid URI encoding";
         return -1;
         }

-      new=store_get(sizeof(string_item));
-      new->text=store_get(to.length+1);
-      if (to.length) memcpy(new->text,to.character,to.length);
+      new=store_get(sizeof(string_item), FALSE);
+      new->text = store_get(to.length+1, is_tainted(to.character));
+      if (to.length) memcpy(new->text, to.character, to.length);

       new->text[to.length]='\0';
       new->next=*recipient;
       *recipient=new;
       new->text[to.length]='\0';
       new->next=*recipient;
       *recipient=new;


@@ -500,9 +502,9 @@ if (*uri=='?')
       }
     if (hname.length==2 && strcmpic(hname.character, US"to")==0)
       {
       }
     if (hname.length==2 && strcmpic(hname.character, US"to")==0)
       {

-      new=store_get(sizeof(string_item));
-      new->text=store_get(hvalue.length+1);
-      if (hvalue.length) memcpy(new->text,hvalue.character,hvalue.length);
+      new=store_get(sizeof(string_item), FALSE);
+      new->text = store_get(hvalue.length+1, is_tainted(hvalue.character));
+      if (hvalue.length) memcpy(new->text, hvalue.character, hvalue.length);

       new->text[hvalue.length]='\0';
       new->next=*recipient;
       *recipient=new;
       new->text[hvalue.length]='\0';
       new->next=*recipient;
       *recipient=new;


@@ -852,21 +854,15 @@ if ((filter_test != FTEST_NONE && debug_selector != 0) ||
 switch (mt)
   {
   case MATCH_IS:
 switch (mt)
   {
   case MATCH_IS:

-    {

     switch (co)
       {
       case COMP_OCTET:
     switch (co)
       {
       case COMP_OCTET:

-        {

         if (eq_octet(needle,haystack,0)) r=1;
         break;
         if (eq_octet(needle,haystack,0)) r=1;
         break;

-        }

       case COMP_EN_ASCII_CASEMAP:
       case COMP_EN_ASCII_CASEMAP:

-        {

         if (eq_asciicase(needle,haystack,0)) r=1;
         break;
         if (eq_asciicase(needle,haystack,0)) r=1;
         break;

-        }

       case COMP_ASCII_NUMERIC:
       case COMP_ASCII_NUMERIC:

-        {

         if (!filter->require_iascii_numeric)
           {
           filter->errmsg=CUS "missing previous require \"comparator-i;ascii-numeric\";";
         if (!filter->require_iascii_numeric)
           {
           filter->errmsg=CUS "missing previous require \"comparator-i;ascii-numeric\";";


@@ -874,10 +870,9 @@ switch (mt)
           }
         if (eq_asciinumeric(needle,haystack,EQ)) r=1;
         break;
           }
         if (eq_asciinumeric(needle,haystack,EQ)) r=1;
         break;

-        }

       }
     break;
       }
     break;

-    }
+

   case MATCH_CONTAINS:
     {
     struct String h;
   case MATCH_CONTAINS:
     {
     struct String h;


@@ -885,53 +880,42 @@ switch (mt)
     switch (co)
       {
       case COMP_OCTET:
     switch (co)
       {
       case COMP_OCTET:

-        {
-        for (h=*haystack; h.length; ++h.character,--h.length) if (eq_octet(needle,&h,1)) { r=1; break; }
+        for (h = *haystack; h.length; ++h.character,--h.length)
+        if (eq_octet(needle,&h,1)) { r=1; break; }

         break;
         break;

-        }

       case COMP_EN_ASCII_CASEMAP:
       case COMP_EN_ASCII_CASEMAP:

-        {
-        for (h=*haystack; h.length; ++h.character,--h.length) if (eq_asciicase(needle,&h,1)) { r=1; break; }
+        for (h = *haystack; h.length; ++h.character, --h.length)
+         if (eq_asciicase(needle,&h,1)) { r=1; break; }

         break;
         break;

-        }

       default:
       default:

-        {

         filter->errmsg=CUS "comparator does not offer specified matchtype";
         return -1;
         filter->errmsg=CUS "comparator does not offer specified matchtype";
         return -1;

-        }

       }
     break;
     }
       }
     break;
     }

+

   case MATCH_MATCHES:
   case MATCH_MATCHES:

-    {

     switch (co)
       {
       case COMP_OCTET:
     switch (co)
       {
       case COMP_OCTET:

-        {

         if ((r=eq_glob(needle,haystack,0,1))==-1)
           {
           filter->errmsg=CUS "syntactically invalid pattern";
           return -1;
           }
         break;
         if ((r=eq_glob(needle,haystack,0,1))==-1)
           {
           filter->errmsg=CUS "syntactically invalid pattern";
           return -1;
           }
         break;

-        }

       case COMP_EN_ASCII_CASEMAP:
       case COMP_EN_ASCII_CASEMAP:

-        {

         if ((r=eq_glob(needle,haystack,1,1))==-1)
           {
           filter->errmsg=CUS "syntactically invalid pattern";
           return -1;
           }
         break;
         if ((r=eq_glob(needle,haystack,1,1))==-1)
           {
           filter->errmsg=CUS "syntactically invalid pattern";
           return -1;
           }
         break;

-        }

       default:
       default:

-        {

         filter->errmsg=CUS "comparator does not offer specified matchtype";
         return -1;
         filter->errmsg=CUS "comparator does not offer specified matchtype";
         return -1;

-        }

       }
     break;
       }
     break;

-    }

   }
 if ((filter_test != FTEST_NONE && debug_selector != 0) ||
   (debug_selector & D_filter) != 0)
   }
 if ((filter_test != FTEST_NONE && debug_selector != 0) ||
   (debug_selector & D_filter) != 0)


@@ -1048,7 +1032,7 @@ add_addr(address_item **generated, uschar *addr, int file, int maxage, int maxme
 {
 address_item *new_addr;
 
 {
 address_item *new_addr;
 

-for (new_addr=*generated; new_addr; new_addr=new_addr->next)
+for (new_addr = *generated; new_addr; new_addr = new_addr->next)

   if (  Ustrcmp(new_addr->address,addr) == 0
      && (  !file
        || testflag(new_addr, af_pfr)
   if (  Ustrcmp(new_addr->address,addr) == 0
      && (  !file
        || testflag(new_addr, af_pfr)


@@ -1103,7 +1087,8 @@ uschar *errmsg;
 value->length=0;
 value->character=(uschar*)0;
 
 value->length=0;
 value->character=(uschar*)0;
 

-t=r=s=expand_string(string_sprintf("$rheader_%s",quote(header)));
+t = r = s = expand_string(string_sprintf("$rheader_%s",quote(header)));
+if (!t) return;

 while (*r==' ' || *r=='\t') ++r;
 while (*r)
   {
 while (*r==' ' || *r=='\t') ++r;
 while (*r)
   {


@@ -1268,7 +1253,9 @@ do
   {
   int x,d,n;
 
   {
   int x,d,n;
 

-  for (x=0,d=0; d<2 && src<end && isxdigit(n=tolower(*src)); x=(x<<4)|(n>='0' && n<='9' ? n-'0' : 10+(n-'a')),++d,++src);
+  for (x = 0, d = 0;
+      d<2 && src<end && isxdigit(n=tolower(*src));
+      x=(x<<4)|(n>='0' && n<='9' ? n-'0' : 10+(n-'a')) ,++d, ++src) ;

   if (d==0) return -1;
   if (dst) *dst++=x;
   ++decoded;
   if (d==0) return -1;
   if (dst) *dst++=x;
   ++decoded;


@@ -1310,7 +1297,8 @@ Returns:      >=0              number of decoded octets
               -2               semantic error (character range violation)
 */
 
               -2               semantic error (character range violation)
 */
 

-static int unicode_decode(uschar *src, uschar *end, uschar *dst)
+static int
+unicode_decode(uschar *src, uschar *end, uschar *dst)

 {
 int decoded=0;
 
 {
 int decoded=0;
 


@@ -1321,9 +1309,11 @@ do
   int c,d,n;
 
   unicode_hex:
   int c,d,n;
 
   unicode_hex:

-  for (hex_seq=src; src<end && *src=='0'; ++src);
-  for (c=0,d=0; d<7 && src<end && isxdigit(n=tolower(*src)); c=(c<<4)|(n>='0' && n<='9' ? n-'0' : 10+(n-'a')),++d,++src);
-  if (src==hex_seq) return -1;
+  for (hex_seq = src; src < end && *src=='0'; ) src++;
+  for (c = 0, d = 0;
+       d < 7 && src < end && isxdigit(n=tolower(*src));
+       c=(c<<4)|(n>='0' && n<='9' ? n-'0' : 10+(n-'a')), ++d, ++src) ;
+  if (src == hex_seq) return -1;

   if (d==7 || (!((c>=0 && c<=0xd7ff) || (c>=0xe000 && c<=0x10ffff)))) return -2;
   if (c<128)
     {
   if (d==7 || (!((c>=0 && c<=0xd7ff) || (c>=0xe000 && c<=0x10ffff)))) return -2;
   if (c<128)
     {


@@ -1472,10 +1462,10 @@ Returns:      1                success
               0                identifier not matched
 */
 
               0                identifier not matched
 */
 

-static int parse_string(struct Sieve *filter, struct String *data)
+static int
+parse_string(struct Sieve *filter, struct String *data)

 {
 gstring * g = NULL;
 {
 gstring * g = NULL;

-int dataCapacity=0;

 
 data->length = 0;
 data->character = NULL;
 
 data->length = 0;
 data->character = NULL;


@@ -1737,10 +1727,9 @@ if (*filter->pc=='[') /* string list */
     if (dataLength+1 >= dataCapacity) /* increase buffer */
       {
       struct String *new;
     if (dataLength+1 >= dataCapacity) /* increase buffer */
       {
       struct String *new;

-      int newCapacity;          /* Don't amalgamate with next line; some compilers grumble */

 
       dataCapacity = dataCapacity ? dataCapacity * 2 : 4;
 
       dataCapacity = dataCapacity ? dataCapacity * 2 : 4;

-      new = store_get(sizeof(struct String) * dataCapacity);
+      new = store_get(sizeof(struct String) * dataCapacity, FALSE);

 
       if (d) memcpy(new,d,sizeof(struct String)*dataLength);
       d = new;
 
       if (d) memcpy(new,d,sizeof(struct String)*dataLength);
       d = new;


@@ -1778,15 +1767,13 @@ if (*filter->pc=='[') /* string list */
   }
 else /* single string */
   {
   }
 else /* single string */
   {

-  if ((d=store_get(sizeof(struct String)*2))==(struct String*)0)
-    {
+  if (!(d=store_get(sizeof(struct String)*2, FALSE)))

     return -1;
     return -1;

-    }
+

   m=parse_string(filter,&d[0]);
   if (m==-1)
   m=parse_string(filter,&d[0]);
   if (m==-1)

-    {

     return -1;
     return -1;

-    }
+

   else if (m==0)
     {
     filter->pc=orig;
   else if (m==0)
     {
     filter->pc=orig;


@@ -2042,7 +2029,8 @@ Returns:      1                success
               -1               syntax or execution error
 */
 
               -1               syntax or execution error
 */
 

-static int parse_test(struct Sieve *filter, int *cond, int exec)
+static int
+parse_test(struct Sieve *filter, int *cond, int exec)

 {
 if (parse_white(filter)==-1) return -1;
 if (parse_identifier(filter,CUS "address"))
 {
 if (parse_white(filter)==-1) return -1;
 if (parse_identifier(filter,CUS "address"))


@@ -2057,7 +2045,7 @@ if (parse_identifier(filter,CUS "address"))
   enum AddressPart addressPart=ADDRPART_ALL;
   enum Comparator comparator=COMP_EN_ASCII_CASEMAP;
   enum MatchType matchType=MATCH_IS;
   enum AddressPart addressPart=ADDRPART_ALL;
   enum Comparator comparator=COMP_EN_ASCII_CASEMAP;
   enum MatchType matchType=MATCH_IS;

-  struct String *hdr,*h,*key,*k;
+  struct String *hdr,*key;

   int m;
   int ap=0,co=0,mt=0;
 
   int m;
   int ap=0,co=0,mt=0;
 


@@ -2109,7 +2097,7 @@ if (parse_identifier(filter,CUS "address"))
     return -1;
     }
   *cond=0;
     return -1;
     }
   *cond=0;

-  for (h=hdr; h->length!=-1 && !*cond; ++h)
+  for (struct String * h = hdr; h->length!=-1 && !*cond; ++h)

     {
     uschar *header_value=(uschar*)0,*extracted_addr,*end_addr;
 
     {
     uschar *header_value=(uschar*)0,*extracted_addr,*end_addr;
 


@@ -2130,13 +2118,12 @@ if (parse_identifier(filter,CUS "address"))
     if (exec)
       {
       /* We are only interested in addresses below, so no MIME decoding */
     if (exec)
       {
       /* We are only interested in addresses below, so no MIME decoding */

-      header_value=expand_string(string_sprintf("$rheader_%s",quote(h)));
-      if (header_value == NULL)
+      if (!(header_value = expand_string(string_sprintf("$rheader_%s",quote(h)))))

         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;
         }
         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;
         }

-      parse_allow_group = TRUE;
+      f.parse_allow_group = TRUE;

       while (*header_value && !*cond)
         {
         uschar *error;
       while (*header_value && !*cond)
         {
         uschar *error;


@@ -2165,12 +2152,10 @@ if (parse_identifier(filter,CUS "address"))
         *end_addr = saveend;
         if (part)
           {
         *end_addr = saveend;
         if (part)
           {

-          for (k=key; k->length!=-1; ++k)
+          for (struct String * k = key; k->length !=- 1; ++k)

             {
             {

-            struct String partStr;
+            struct String partStr = {.character = part, .length = Ustrlen(part)};

 
 

-            partStr.character=part;
-            partStr.length=Ustrlen(part);

             if (extracted_addr)
               {
               *cond=compare(filter,k,&partStr,comparator,matchType);
             if (extracted_addr)
               {
               *cond=compare(filter,k,&partStr,comparator,matchType);


@@ -2182,8 +2167,8 @@ if (parse_identifier(filter,CUS "address"))
         if (saveend == 0) break;
         header_value = end_addr + 1;
         }
         if (saveend == 0) break;
         header_value = end_addr + 1;
         }

-      parse_allow_group = FALSE;
-      parse_found_group = FALSE;
+      f.parse_allow_group = FALSE;
+      f.parse_found_group = FALSE;

       }
     }
   return 1;
       }
     }
   return 1;


@@ -2224,7 +2209,7 @@ else if (parse_identifier(filter,CUS "exists"))
   exists-test = "exists" <header-names: string-list>
   */
 
   exists-test = "exists" <header-names: string-list>
   */
 

-  struct String *hdr,*h;
+  struct String *hdr;

   int m;
 
   if (parse_white(filter)==-1) return -1;
   int m;
 
   if (parse_white(filter)==-1) return -1;


@@ -2236,12 +2221,12 @@ else if (parse_identifier(filter,CUS "exists"))
   if (exec)
     {
     *cond=1;
   if (exec)
     {
     *cond=1;

-    for (h=hdr; h->length!=-1 && *cond; ++h)
+    for (struct String * h = hdr; h->length != -1 && *cond; ++h)

       {
       uschar *header_def;
 
       {
       uschar *header_def;
 

-      header_def=expand_string(string_sprintf("${if def:header_%s {true}{false}}",quote(h)));
-      if (header_def == NULL)
+      header_def = expand_string(string_sprintf("${if def:header_%s {true}{false}}",quote(h)));
+      if (!header_def)

         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;
         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;


@@ -2269,7 +2254,7 @@ else if (parse_identifier(filter,CUS "header"))
 
   enum Comparator comparator=COMP_EN_ASCII_CASEMAP;
   enum MatchType matchType=MATCH_IS;
 
   enum Comparator comparator=COMP_EN_ASCII_CASEMAP;
   enum MatchType matchType=MATCH_IS;

-  struct String *hdr,*h,*key,*k;
+  struct String *hdr,*key;

   int m;
   int co=0,mt=0;
 
   int m;
   int co=0,mt=0;
 


@@ -2311,7 +2296,7 @@ else if (parse_identifier(filter,CUS "header"))
     return -1;
     }
   *cond=0;
     return -1;
     }
   *cond=0;

-  for (h=hdr; h->length!=-1 && !*cond; ++h)
+  for (struct String * h = hdr; h->length != -1 && !*cond; ++h)

     {
     if (!is_header(h))
       {
     {
     if (!is_header(h))
       {


@@ -2324,21 +2309,19 @@ else if (parse_identifier(filter,CUS "header"))
       uschar *header_def;
 
       expand_header(&header_value,h);
       uschar *header_def;
 
       expand_header(&header_value,h);

-      header_def=expand_string(string_sprintf("${if def:header_%s {true}{false}}",quote(h)));
-      if (header_value.character == NULL || header_def == NULL)
+      header_def = expand_string(string_sprintf("${if def:header_%s {true}{false}}",quote(h)));
+      if (!header_value.character || !header_def)

         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;
         }
         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;
         }

-      for (k=key; k->length!=-1; ++k)
-        {
+      for (struct String * k = key; k->length != -1; ++k)

         if (Ustrcmp(header_def,"true")==0)
           {
           *cond=compare(filter,k,&header_value,comparator,matchType);
           if (*cond==-1) return -1;
           if (*cond) break;
           }
         if (Ustrcmp(header_def,"true")==0)
           {
           *cond=compare(filter,k,&header_value,comparator,matchType);
           if (*cond==-1) return -1;
           if (*cond) break;
           }

-        }

       }
     }
   return 1;
       }
     }
   return 1;


@@ -2396,7 +2379,7 @@ else if (parse_identifier(filter,CUS "envelope"))
   enum Comparator comparator=COMP_EN_ASCII_CASEMAP;
   enum AddressPart addressPart=ADDRPART_ALL;
   enum MatchType matchType=MATCH_IS;
   enum Comparator comparator=COMP_EN_ASCII_CASEMAP;
   enum AddressPart addressPart=ADDRPART_ALL;
   enum MatchType matchType=MATCH_IS;

-  struct String *env,*e,*key,*k;
+  struct String *env,*key;

   int m;
   int co=0,ap=0,mt=0;
 
   int m;
   int co=0,ap=0,mt=0;
 


@@ -2453,7 +2436,7 @@ else if (parse_identifier(filter,CUS "envelope"))
     return -1;
     }
   *cond=0;
     return -1;
     }
   *cond=0;

-  for (e=env; e->length!=-1 && !*cond; ++e)
+  for (struct String * e = env; e->length != -1 && !*cond; ++e)

     {
     const uschar *envelopeExpr=CUS 0;
     uschar *envelope=US 0;
     {
     const uschar *envelopeExpr=CUS 0;
     uschar *envelope=US 0;


@@ -2510,17 +2493,15 @@ else if (parse_identifier(filter,CUS "envelope"))
       }
     if (exec && envelopeExpr)
       {
       }
     if (exec && envelopeExpr)
       {

-      if ((envelope=expand_string(US envelopeExpr)) == NULL)
+      if (!(envelope=expand_string(US envelopeExpr)))

         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;
         }
         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;
         }

-      for (k=key; k->length!=-1; ++k)
+      for (struct String * k = key; k->length != -1; ++k)

         {
         {

-        struct String envelopeStr;
+        struct String envelopeStr = {.character = envelope, .length = Ustrlen(envelope)};

 
 

-        envelopeStr.character=envelope;
-        envelopeStr.length=Ustrlen(envelope);

         *cond=compare(filter,k,&envelopeStr,comparator,matchType);
         if (*cond==-1) return -1;
         if (*cond) break;
         *cond=compare(filter,k,&envelopeStr,comparator,matchType);
         if (*cond==-1) return -1;
         if (*cond) break;


@@ -2537,7 +2518,7 @@ else if (parse_identifier(filter,CUS "valid_notify_method"))
                         <notification-uris: string-list>
   */
 
                         <notification-uris: string-list>
   */
 

-  struct String *uris,*u;
+  struct String *uris;

   int m;
 
   if (!filter->require_enotify)
   int m;
 
   if (!filter->require_enotify)


@@ -2554,7 +2535,7 @@ else if (parse_identifier(filter,CUS "valid_notify_method"))
   if (exec)
     {
     *cond=1;
   if (exec)
     {
     *cond=1;

-    for (u=uris; u->length!=-1 && *cond; ++u)
+    for (struct String * u = uris; u->length != -1 && *cond; ++u)

       {
         string_item *recipient;
         struct String header,subject,body;
       {
         string_item *recipient;
         struct String header,subject,body;


@@ -2586,7 +2567,7 @@ else if (parse_identifier(filter,CUS "notify_method_capability"))
 
   enum Comparator comparator=COMP_EN_ASCII_CASEMAP;
   enum MatchType matchType=MATCH_IS;
 
   enum Comparator comparator=COMP_EN_ASCII_CASEMAP;
   enum MatchType matchType=MATCH_IS;

-  struct String uri,capa,*keys,*k;
+  struct String uri,capa,*keys;

 
   if (!filter->require_enotify)
     {
 
   if (!filter->require_enotify)
     {


@@ -2649,15 +2630,13 @@ else if (parse_identifier(filter,CUS "notify_method_capability"))
       body.length=-1;
       body.character=(uschar*)0;
       if (parse_mailto_uri(filter,uri.character,&recipient,&header,&subject,&body)==1)
       body.length=-1;
       body.character=(uschar*)0;
       if (parse_mailto_uri(filter,uri.character,&recipient,&header,&subject,&body)==1)

-        {

         if (eq_asciicase(&capa,&str_online,0)==1)
         if (eq_asciicase(&capa,&str_online,0)==1)

-          for (k=keys; k->length!=-1; ++k)
+          for (struct String * k = keys; k->length != -1; ++k)

             {
             *cond=compare(filter,k,&str_maybe,comparator,matchType);
             if (*cond==-1) return -1;
             if (*cond) break;
             }
             {
             *cond=compare(filter,k,&str_maybe,comparator,matchType);
             if (*cond==-1) return -1;
             if (*cond) break;
             }

-        }

       }
     return 1;
   }
       }
     return 1;
   }


@@ -3011,7 +2990,13 @@ while (*filter->pc)
     subject.character=(uschar*)0;
     body.length=-1;
     body.character=(uschar*)0;
     subject.character=(uschar*)0;
     body.length=-1;
     body.character=(uschar*)0;

-    envelope_from=(sender_address && sender_address[0]) ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : US "";
+    envelope_from = sender_address && sender_address[0]
+     ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : US "";
+    if (!envelope_from)
+      {
+      filter->errmsg=CUS "expansion failure for envelope from";
+      return -1;
+      }

     for (;;)
       {
       if (parse_white(filter)==-1) return -1;
     for (;;)
       {
       if (parse_white(filter)==-1) return -1;


@@ -3067,8 +3052,8 @@ while (*filter->pc)
       if (message.length==-1) message=subject;
       if (message.length==-1) expand_header(&message,&str_subject);
       expand_header(&auto_submitted_value,&str_auto_submitted);
       if (message.length==-1) message=subject;
       if (message.length==-1) expand_header(&message,&str_subject);
       expand_header(&auto_submitted_value,&str_auto_submitted);

-      auto_submitted_def=expand_string(string_sprintf("${if def:header_auto-submitted {true}{false}}"));
-      if (auto_submitted_value.character == NULL || auto_submitted_def == NULL)
+      auto_submitted_def=expand_string(US"${if def:header_auto-submitted {true}{false}}");
+      if (!auto_submitted_value.character || !auto_submitted_def)

         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;
         {
         filter->errmsg=CUS "header string expansion failed";
         return -1;


@@ -3085,11 +3070,10 @@ while (*filter->pc)
               && (message.length==-1 || Ustrcmp(already->message.character,message.character)==0))
             break;
           }
               && (message.length==-1 || Ustrcmp(already->message.character,message.character)==0))
             break;
           }

-        if (already==(struct Notification*)0)
+        if (!already)

           /* New notification, process it */
           {
           /* New notification, process it */
           {

-          struct Notification *sent;
-          sent=store_get(sizeof(struct Notification));
+          struct Notification * sent = store_get(sizeof(struct Notification), FALSE);

           sent->method=method;
           sent->importance=importance;
           sent->message=message;
           sent->method=method;
           sent->importance=importance;
           sent->message=message;


@@ -3098,8 +3082,7 @@ while (*filter->pc)
   #ifndef COMPILE_SYNTAX_CHECKER
           if (filter_test == FTEST_NONE)
             {
   #ifndef COMPILE_SYNTAX_CHECKER
           if (filter_test == FTEST_NONE)
             {

-            string_item *p;
-            int pid,fd;
+            int pid, fd;

 
             if ((pid = child_open_exim2(&fd,envelope_from,envelope_from))>=1)
               {
 
             if ((pid = child_open_exim2(&fd,envelope_from,envelope_from))>=1)
               {


@@ -3108,8 +3091,10 @@ while (*filter->pc)
               int buffer_capacity;
 
               f = fdopen(fd, "wb");
               int buffer_capacity;
 
               f = fdopen(fd, "wb");

-              fprintf(f,"From: %s\n",from.length==-1 ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : from.character);
-              for (p=recipient; p; p=p->next) fprintf(f,"To: %s\n",p->text);
+              fprintf(f,"From: %s\n", from.length == -1
+               ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : from.character);
+              for (string_item * p = recipient; p; p=p->next)
+               fprintf(f,"To: %s\n",p->text);

               fprintf(f,"Auto-Submitted: auto-notified; %s\n",filter->enotify_mailto_owner);
               if (header.length>0) fprintf(f,"%s",header.character);
               if (message.length==-1)
               fprintf(f,"Auto-Submitted: auto-notified; %s\n",filter->enotify_mailto_owner);
               if (header.length>0) fprintf(f,"%s",header.character);
               if (message.length==-1)


@@ -3119,7 +3104,7 @@ while (*filter->pc)
                 }
               /* Allocation is larger than necessary, but enough even for split MIME words */
               buffer_capacity=32+4*message.length;
                 }
               /* Allocation is larger than necessary, but enough even for split MIME words */
               buffer_capacity=32+4*message.length;

-              buffer=store_get(buffer_capacity);
+              buffer=store_get(buffer_capacity, TRUE);

               if (message.length!=-1) fprintf(f,"Subject: %s\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, buffer_capacity, TRUE));
               fprintf(f,"\n");
               if (body.length>0) fprintf(f,"%s\n",body.character);
               if (message.length!=-1) fprintf(f,"Subject: %s\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, buffer_capacity, TRUE));
               fprintf(f,"\n");
               if (body.length>0) fprintf(f,"%s\n",body.character);


@@ -3231,20 +3216,17 @@ while (*filter->pc)
         }
       else if (parse_identifier(filter,CUS ":addresses")==1)
         {
         }
       else if (parse_identifier(filter,CUS ":addresses")==1)
         {

-        struct String *a;
-

         if (parse_white(filter)==-1) return -1;
         if ((m=parse_stringlist(filter,&addresses))!=1)
           {
           if (m==0) filter->errmsg=CUS "addresses string list expected";
           return -1;
           }
         if (parse_white(filter)==-1) return -1;
         if ((m=parse_stringlist(filter,&addresses))!=1)
           {
           if (m==0) filter->errmsg=CUS "addresses string list expected";
           return -1;
           }

-        for (a=addresses; a->length!=-1; ++a)
+        for (struct String * a = addresses; a->length != -1; ++a)

           {
           {

-          string_item *new;
+          string_item * new = store_get(sizeof(string_item), FALSE);

 
 

-          new=store_get(sizeof(string_item));
-          new->text=store_get(a->length+1);
+          new->text = store_get(a->length+1, is_tainted(a->character));

           if (a->length) memcpy(new->text,a->character,a->length);
           new->text[a->length]='\0';
           new->next=aliases;
           if (a->length) memcpy(new->text,a->character,a->length);
           new->text[a->length]='\0';
           new->next=aliases;


@@ -3274,7 +3256,8 @@ while (*filter->pc)
       {
       uschar *s,*end;
 
       {
       uschar *s,*end;
 

-      for (s=reason.character,end=reason.character+reason.length; s<end && (*s&0x80)==0; ++s);
+      for (s = reason.character, end = reason.character + reason.length;
+         s<end && (*s&0x80)==0; ) s++;

       if (s<end)
         {
         filter->errmsg=CUS "MIME reason string contains 8bit text";
       if (s<end)
         {
         filter->errmsg=CUS "MIME reason string contains 8bit text";


@@ -3286,13 +3269,11 @@ while (*filter->pc)
     if (exec)
       {
       address_item *addr;
     if (exec)
       {
       address_item *addr;

-      int start;

       uschar *buffer;
       int buffer_capacity;
       md5 base;
       uschar digest[16];
       uschar hexdigest[33];
       uschar *buffer;
       int buffer_capacity;
       md5 base;
       uschar digest[16];
       uschar hexdigest[33];

-      int i;

       gstring * once;
 
       if (filter_personal(aliases,TRUE))
       gstring * once;
 
       if (filter_personal(aliases,TRUE))


@@ -3319,7 +3300,7 @@ while (*filter->pc)
         else
          md5_end(&base, handle.character, handle.length, digest);
 
         else
          md5_end(&base, handle.character, handle.length, digest);
 

-        for (i = 0; i < 16; i++) sprintf(CS (hexdigest+2*i), "%02X", digest[i]);
+        for (int i = 0; i < 16; i++) sprintf(CS (hexdigest+2*i), "%02X", digest[i]);

 
         if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0)
           debug_printf("Sieve: mail was personal, vacation file basename: %s\n", hexdigest);
 
         if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0)
           debug_printf("Sieve: mail was personal, vacation file basename: %s\n", hexdigest);


@@ -3336,8 +3317,8 @@ while (*filter->pc)
             {
             uschar *subject_def;
 
             {
             uschar *subject_def;
 

-            subject_def=expand_string(US"${if def:header_subject {true}{false}}");
-            if (Ustrcmp(subject_def,"true")==0)
+            subject_def = expand_string(US"${if def:header_subject {true}{false}}");
+            if (subject_def && Ustrcmp(subject_def,"true")==0)

               {
              gstring * g = string_catn(NULL, US"Auto: ", 6);
 
               {
              gstring * g = string_catn(NULL, US"Auto: ", 6);
 


@@ -3360,7 +3341,7 @@ while (*filter->pc)
           addr->prop.ignore_error = TRUE;
           addr->next = *generated;
           *generated = addr;
           addr->prop.ignore_error = TRUE;
           addr->next = *generated;
           *generated = addr;

-          addr->reply = store_get(sizeof(reply_item));
+          addr->reply = store_get(sizeof(reply_item), FALSE);

           memset(addr->reply,0,sizeof(reply_item)); /* XXX */
           addr->reply->to = string_copy(sender_address);
           if (from.length==-1)
           memset(addr->reply,0,sizeof(reply_item)); /* XXX */
           addr->reply->to = string_copy(sender_address);
           if (from.length==-1)


@@ -3369,7 +3350,7 @@ while (*filter->pc)
             addr->reply->from = from.character;
           /* Allocation is larger than necessary, but enough even for split MIME words */
           buffer_capacity=32+4*subject.length;
             addr->reply->from = from.character;
           /* Allocation is larger than necessary, but enough even for split MIME words */
           buffer_capacity=32+4*subject.length;

-          buffer=store_get(buffer_capacity);
+          buffer = store_get(buffer_capacity, is_tainted(subject.character));

          /* deconst cast safe as we pass in a non-const item */
           addr->reply->subject = US parse_quote_2047(subject.character, subject.length, US"utf-8", buffer, buffer_capacity, TRUE);
           addr->reply->oncelog = string_from_gstring(once);
          /* deconst cast safe as we pass in a non-const item */
           addr->reply->subject = US parse_quote_2047(subject.character, subject.length, US"utf-8", buffer, buffer_capacity, TRUE);
           addr->reply->oncelog = string_from_gstring(once);


@@ -3384,10 +3365,9 @@ while (*filter->pc)
 
             for
               (
 
             for
               (

-              mime_body=reason.character,reason_end=reason.character+reason.length;
-              mime_body<(reason_end-(sizeof(nlnl)-1)) && memcmp(mime_body,nlnl,(sizeof(nlnl)-1));
-              ++mime_body
-              );
+              mime_body = reason.character, reason_end = reason.character + reason.length;
+              mime_body < (reason_end-(sizeof(nlnl)-1)) && memcmp(mime_body, nlnl, (sizeof(nlnl)-1));
+             ) mime_body++;

 
             addr->reply->headers = string_copyn(reason.character, mime_body-reason.character);
 
 
             addr->reply->headers = string_copyn(reason.character, mime_body-reason.character);
 


@@ -3399,7 +3379,6 @@ while (*filter->pc)
             {
             struct String qp = { .character = NULL, .length = 0 };  /* Keep compiler happy (PH) */
 
             {
             struct String qp = { .character = NULL, .length = 0 };  /* Keep compiler happy (PH) */
 

-            start = reason.length;

             addr->reply->headers = US"MIME-Version: 1.0\n"
                                    "Content-Type: text/plain;\n"
                                    "\tcharset=\"utf-8\"\n"
             addr->reply->headers = US"MIME-Version: 1.0\n"
                                    "Content-Type: text/plain;\n"
                                    "\tcharset=\"utf-8\"\n"


@@ -3503,7 +3482,7 @@ while (parse_identifier(filter,CUS "require"))
   require-command = "require" <capabilities: string-list>
   */
 
   require-command = "require" <capabilities: string-list>
   */
 

-  struct String *cap,*check;
+  struct String *cap;

   int m;
 
   if (parse_white(filter)==-1) return -1;
   int m;
 
   if (parse_white(filter)==-1) return -1;


@@ -3512,7 +3491,7 @@ while (parse_identifier(filter,CUS "require"))
     if (m==0) filter->errmsg=CUS "capability string list expected";
     return -1;
     }
     if (m==0) filter->errmsg=CUS "capability string list expected";
     return -1;
     }

-  for (check=cap; check->character; ++check)
+  for (struct String * check = cap; check->character; ++check)

     {
     if (eq_octet(check,&str_envelope,0)) filter->require_envelope=1;
     else if (eq_octet(check,&str_fileinto,0)) filter->require_fileinto=1;
     {
     if (eq_octet(check,&str_envelope,0)) filter->require_envelope=1;
     else if (eq_octet(check,&str_fileinto,0)) filter->require_fileinto=1;


@@ -3607,14 +3586,13 @@ options = options; /* Keep picky compilers happy */
 error = error;
 
 DEBUG(D_route) debug_printf("Sieve: start of processing\n");
 error = error;
 
 DEBUG(D_route) debug_printf("Sieve: start of processing\n");

-sieve.filter=filter;
+sieve.filter = filter;

 
 

-if (vacation_directory == NULL)
+if (!vacation_directory)

   sieve.vacation_directory = NULL;
 else
   {
   sieve.vacation_directory = NULL;
 else
   {

-  sieve.vacation_directory=expand_string(vacation_directory);
-  if (sieve.vacation_directory == NULL)
+  if (!(sieve.vacation_directory = expand_string(vacation_directory)))

     {
     *error = string_sprintf("failed to expand \"%s\" "
       "(sieve_vacation_directory): %s", vacation_directory,
     {
     *error = string_sprintf("failed to expand \"%s\" "
       "(sieve_vacation_directory): %s", vacation_directory,


@@ -3623,12 +3601,11 @@ else
     }
   }
 
     }
   }
 

-if (enotify_mailto_owner == NULL)
+if (!enotify_mailto_owner)

   sieve.enotify_mailto_owner = NULL;
 else
   {
   sieve.enotify_mailto_owner = NULL;
 else
   {

-  sieve.enotify_mailto_owner=expand_string(enotify_mailto_owner);
-  if (sieve.enotify_mailto_owner == NULL)
+  if (!(sieve.enotify_mailto_owner = expand_string(enotify_mailto_owner)))

     {
     *error = string_sprintf("failed to expand \"%s\" "
       "(sieve_enotify_mailto_owner): %s", enotify_mailto_owner,
     {
     *error = string_sprintf("failed to expand \"%s\" "
       "(sieve_enotify_mailto_owner): %s", enotify_mailto_owner,


@@ -3637,7 +3614,8 @@ else
     }
   }
 
     }
   }
 

-sieve.useraddress = useraddress == NULL ? CUS "$local_part_prefix$local_part$local_part_suffix" : useraddress;
+sieve.useraddress = useraddress
+  ? useraddress : CUS "$local_part_prefix$local_part$local_part_suffix";

 sieve.subaddress = subaddress;
 
 #ifdef COMPILE_SYNTAX_CHECKER
 sieve.subaddress = subaddress;
 
 #ifdef COMPILE_SYNTAX_CHECKER


@@ -3649,12 +3627,12 @@ if (parse_start(&sieve,1,generated)==1)
   if (sieve.keep)
     {
     add_addr(generated,US"inbox",1,0,0,0);
   if (sieve.keep)
     {
     add_addr(generated,US"inbox",1,0,0,0);

-    msg = string_sprintf("Implicit keep");
+    msg = US"Implicit keep";

     r = FF_DELIVERED;
     }
   else
     {
     r = FF_DELIVERED;
     }
   else
     {

-    msg = string_sprintf("No implicit keep");
+    msg = US"No implicit keep";

     r = FF_DELIVERED;
     }
   }
     r = FF_DELIVERED;
     }
   }