Safer coding for utf8clean expansion operator

diff --git a/src/src/expand.c b/src/src/expand.c
index 0b6513ccdab09cac3ecfa336f9ba5e9a5ce99039..e3e1c783320f8cc17795a72fc2851554a29793c7 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -6370,18 +6370,16 @@ while (*s != 0)
 
       case EOP_UTF8CLEAN:
         {
-        int seq_len, index = 0;
+        int seq_len = 0, index = 0;
         int bytes_left = 0;
+       long codepoint = -1;
         uschar seq_buff[4];                    /* accumulate utf-8 here */
         
         while (*sub != 0)
          {
-         int complete;
-         long codepoint;
-         uschar c;
+         int complete = 0;
+         uschar c = *sub++;
 
-         complete = 0;
-         c = *sub++;
          if (bytes_left)
            {
            if ((c & 0xc0) != 0x80)
@@ -6396,7 +6394,7 @@ while (*s != 0)
              if (--bytes_left == 0)            /* codepoint complete */
                {
                if(codepoint > 0x10FFFF)        /* is it too large? */
-                 complete = -1;        /* error */
+                 complete = -1;        /* error (RFC3629 limit) */
                else
                  {             /* finished; output utf-8 sequence */
                  yield = string_cat(yield, &size, &ptr, seq_buff, seq_len);

diff --git a/test/confs/0600 b/test/confs/0600
index 0347e4c60d7eaf98b071a235875301f37a5dffb2..61a9c0801f4aa2d09f9827cf58b165ec17178c49 100644 (file)
--- a/test/confs/0600
+++ b/test/confs/0600
@@ -1,4 +1,5 @@
-# Exim test configuration 0005
+# Exim test configuration 0600
+# utf8clean:string
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns