Fix continue_more on TLS connection. Bug 2104

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

diff --git a/src/src/imap_utf7.c b/src/src/imap_utf7.c
index 739e47f41f246e8a5072adac454dcf0fd1d4fb85..0c3d5a20dc125e55f9e1994d96ff86ad67c3cf8c 100644 (file)
--- a/src/src/imap_utf7.c
+++ b/src/src/imap_utf7.c
@@ -1,6 +1,6 @@
 #include "exim.h"
 
-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N
 
 uschar *
 imap_utf7_encode(uschar *string, const uschar *charset, uschar sep,
@@ -165,13 +165,12 @@ while (slen > 0)
     else
       {
       *error = string_sprintf("imapfolder: illegal character '%c'", s[1]);
-      if (yield) store_reset(yield);
       return NULL;
       }
 
     if (outptr > outbuf + sizeof(outbuf) - 3)
       {
-      yield = string_cat(yield, &size, &ptr, outbuf, outptr - outbuf);
+      yield = string_catn(yield, &size, &ptr, outbuf, outptr - outbuf);
       outptr = outbuf;
       }
 
@@ -197,7 +196,7 @@ if (base64mode)
 iconv_close(icd);
 #endif
 
-yield = string_cat(yield, &size, &ptr, outbuf, outptr - outbuf);
+yield = string_catn(yield, &size, &ptr, outbuf, outptr - outbuf);
 if (yield[ptr-1] == '.')
   ptr--;
 yield[ptr] = '\0';