X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Frfc2047.c;h=6c461029b136d1f9e0ea6ab036bb85032612e9e6;hp=f7085007a8df5ecf10b7fde81b4c8b86bc9124fd;hb=1e1ddfac79fbcd052f199500a6493c7f79cb8462;hpb=f3ebb786e451da973560f1c9d8cdb151d25108b5

diff --git a/src/src/rfc2047.c b/src/src/rfc2047.c
index f7085007a..6c461029b 100644
--- a/src/src/rfc2047.c
+++ b/src/src/rfc2047.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This file contains a function for decoding message header lines that may
@@ -233,17 +234,11 @@ while (mimeword)
 
   #if HAVE_ICONV
   *q1 = 0;
-  if (target != NULL && strcmpic(target, mimeword+2) != 0)
-    {
-    icd = iconv_open(CS target, CS(mimeword+2));
-
-    if (icd == (iconv_t)(-1))
-      {
+  if (target && strcmpic(target, mimeword+2) != 0)
+    if ((icd = iconv_open(CS target, CS(mimeword+2))) == (iconv_t)-1)
       *error = string_sprintf("iconv_open(\"%s\", \"%s\") failed: %s%s",
         target, mimeword+2, strerror(errno),
         (errno == EINVAL)? " (maybe unsupported conversion)" : "");
-      }
-    }
   *q1 = '?';
   #endif