Tidying: coverity issues

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

diff --git a/src/src/exim.c b/src/src/exim.c
index 27b73b764fb3fa1209f5f3ba79be114b56bb3725..490248917775b35e2272a67180409b1aacc2ddf3 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2016 */

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


@@ -817,18 +817,27 @@ fprintf(f, "Support for:");
 #ifndef DISABLE_DKIM
   fprintf(f, " DKIM");
 #endif
 #ifndef DISABLE_DKIM
   fprintf(f, " DKIM");
 #endif

-#ifdef WITH_OLD_DEMIME
-  fprintf(f, " Old_Demime");
-#endif

 #ifndef DISABLE_DNSSEC
   fprintf(f, " DNSSEC");
 #endif
 #ifndef DISABLE_DNSSEC
   fprintf(f, " DNSSEC");
 #endif

-#ifndef DISABLE_PRDR
-  fprintf(f, " PRDR");
+#ifndef DISABLE_EVENT
+  fprintf(f, " Event");
+#endif
+#ifdef SUPPORT_I18N
+  fprintf(f, " I18N");

 #endif
 #ifndef DISABLE_OCSP
   fprintf(f, " OCSP");
 #endif
 #endif
 #ifndef DISABLE_OCSP
   fprintf(f, " OCSP");
 #endif

+#ifndef DISABLE_PRDR
+  fprintf(f, " PRDR");
+#endif
+#ifdef SUPPORT_PROXY
+  fprintf(f, " PROXY");
+#endif
+#ifdef SUPPORT_SOCKS
+  fprintf(f, " SOCKS");
+#endif

 #ifdef EXPERIMENTAL_SPF
   fprintf(f, " Experimental_SPF");
 #endif
 #ifdef EXPERIMENTAL_SPF
   fprintf(f, " Experimental_SPF");
 #endif


@@ -850,21 +859,6 @@ fprintf(f, "Support for:");
 #ifdef EXPERIMENTAL_DSN_INFO
   fprintf(f, " Experimental_DSN_info");
 #endif
 #ifdef EXPERIMENTAL_DSN_INFO
   fprintf(f, " Experimental_DSN_info");
 #endif

-#ifdef EXPERIMENTAL_INTERNATIONAL
-  fprintf(f, " Experimental_International");
-#endif
-#ifdef EXPERIMENTAL_PROXY
-  fprintf(f, " Experimental_Proxy");
-#endif
-#ifdef EXPERIMENTAL_EVENT
-  fprintf(f, " Experimental_Event");
-#endif
-#ifdef EXPERIMENTAL_REDIS
-  fprintf(f, " Experimental_Redis");
-#endif
-#ifdef EXPERIMENTAL_SOCKS
-  fprintf(f, " Experimental_SOCKS");
-#endif

 fprintf(f, "\n");
 
 fprintf(f, "Lookups (built-in):");
 fprintf(f, "\n");
 
 fprintf(f, "Lookups (built-in):");


@@ -907,6 +901,9 @@ fprintf(f, "Lookups (built-in):");
 #if defined(LOOKUP_PGSQL) && LOOKUP_PGSQL!=2
   fprintf(f, " pgsql");
 #endif
 #if defined(LOOKUP_PGSQL) && LOOKUP_PGSQL!=2
   fprintf(f, " pgsql");
 #endif

+#if defined(LOOKUP_REDIS) && LOOKUP_REDIS!=2
+  fprintf(f, " redis");
+#endif

 #if defined(LOOKUP_SQLITE) && LOOKUP_SQLITE!=2
   fprintf(f, " sqlite");
 #endif
 #if defined(LOOKUP_SQLITE) && LOOKUP_SQLITE!=2
   fprintf(f, " sqlite");
 #endif


@@ -1031,7 +1028,7 @@ DEBUG(D_any) do {
 #ifdef SUPPORT_TLS
   tls_version_report(f);
 #endif
 #ifdef SUPPORT_TLS
   tls_version_report(f);
 #endif

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

   utf8_version_report(f);
 #endif
 
   utf8_version_report(f);
 #endif
 


@@ -1139,23 +1136,23 @@ for (t = lpart; !needs_quote && *t != 0; t++)
 if (!needs_quote) return lpart;
 
 size = ptr = 0;
 if (!needs_quote) return lpart;
 
 size = ptr = 0;

-yield = string_cat(NULL, &size, &ptr, US"\"", 1);
+yield = string_catn(NULL, &size, &ptr, US"\"", 1);

 
 for (;;)
   {
   uschar *nq = US Ustrpbrk(lpart, "\\\"");
   if (nq == NULL)
     {
 
 for (;;)
   {
   uschar *nq = US Ustrpbrk(lpart, "\\\"");
   if (nq == NULL)
     {

-    yield = string_cat(yield, &size, &ptr, lpart, Ustrlen(lpart));
+    yield = string_cat(yield, &size, &ptr, lpart);

     break;
     }
     break;
     }

-  yield = string_cat(yield, &size, &ptr, lpart, nq - lpart);
-  yield = string_cat(yield, &size, &ptr, US"\\", 1);
-  yield = string_cat(yield, &size, &ptr, nq, 1);
+  yield = string_catn(yield, &size, &ptr, lpart, nq - lpart);
+  yield = string_catn(yield, &size, &ptr, US"\\", 1);
+  yield = string_catn(yield, &size, &ptr, nq, 1);

   lpart = nq + 1;
   }
 
   lpart = nq + 1;
   }
 

-yield = string_cat(yield, &size, &ptr, US"\"", 1);
+yield = string_catn(yield, &size, &ptr, US"\"", 1);

 yield[ptr] = 0;
 return yield;
 }
 yield[ptr] = 0;
 return yield;
 }


@@ -1269,15 +1266,16 @@ for (i = 0;; i++)
     while (p < ss && isspace(*p)) p++;   /* leading space after cont */
     }
 
     while (p < ss && isspace(*p)) p++;   /* leading space after cont */
     }
 

-  yield = string_cat(yield, &size, &ptr, p, ss - p);
+  yield = string_catn(yield, &size, &ptr, p, ss - p);

 
   #ifdef USE_READLINE
   if (fn_readline != NULL) free(readline_line);
   #endif
 
 
   #ifdef USE_READLINE
   if (fn_readline != NULL) free(readline_line);
   #endif
 

+  /* yield can only be NULL if ss==p */

   if (ss == p || yield[ptr-1] != '\\')
     {
   if (ss == p || yield[ptr-1] != '\\')
     {

-    yield[ptr] = 0;
+    if (yield) yield[ptr] = 0;

     break;
     }
   yield[--ptr] = 0;
     break;
     }
   yield[--ptr] = 0;


@@ -1760,7 +1758,6 @@ regex_whitelisted_macro =
 
 for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
 
 
 for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
 

-

 /* If the program is called as "mailq" treat it as equivalent to "exim -bp";
 this seems to be a generally accepted convention, since one finds symbolic
 links called "mailq" in standard OS configurations. */
 /* If the program is called as "mailq" treat it as equivalent to "exim -bp";
 this seems to be a generally accepted convention, since one finds symbolic
 links called "mailq" in standard OS configurations. */


@@ -2000,7 +1997,7 @@ for (i = 1; i < argc; i++)
 
     else if (*argrest == 'F')
       {
 
     else if (*argrest == 'F')
       {

-      filter_test |= FTEST_SYSTEM;
+      filter_test |= checking = FTEST_SYSTEM;

       if (*(++argrest) != 0) { badarg = TRUE; break; }
       if (++i < argc) filter_test_sfile = argv[i]; else
         {
       if (*(++argrest) != 0) { badarg = TRUE; break; }
       if (++i < argc) filter_test_sfile = argv[i]; else
         {


@@ -2020,7 +2017,7 @@ for (i = 1; i < argc; i++)
       {
       if (*(++argrest) == 0)
         {
       {
       if (*(++argrest) == 0)
         {

-        filter_test |= FTEST_USER;
+        filter_test |= checking = FTEST_USER;

         if (++i < argc) filter_test_ufile = argv[i]; else
           {
           fprintf(stderr, "exim: file name expected after %s\n", argv[i-1]);
         if (++i < argc) filter_test_ufile = argv[i]; else
           {
           fprintf(stderr, "exim: file name expected after %s\n", argv[i-1]);


@@ -2095,6 +2092,7 @@ for (i = 1; i < argc; i++)
     else if (Ustrcmp(argrest, "malware") == 0)
       {
       if (++i >= argc) { badarg = TRUE; break; }
     else if (Ustrcmp(argrest, "malware") == 0)
       {
       if (++i >= argc) { badarg = TRUE; break; }

+      checking = TRUE;

       malware_test_file = argv[i];
       }
 
       malware_test_file = argv[i];
       }
 


@@ -2176,6 +2174,7 @@ for (i = 1; i < argc; i++)
 
     else if (Ustrcmp(argrest, "rt") == 0)
       {
 
     else if (Ustrcmp(argrest, "rt") == 0)
       {

+      checking = TRUE;

       test_retry_arg = i + 1;
       goto END_ARG;
       }
       test_retry_arg = i + 1;
       goto END_ARG;
       }


@@ -2184,6 +2183,7 @@ for (i = 1; i < argc; i++)
 
     else if (Ustrcmp(argrest, "rw") == 0)
       {
 
     else if (Ustrcmp(argrest, "rw") == 0)
       {

+      checking = TRUE;

       test_rewrite_arg = i + 1;
       goto END_ARG;
       }
       test_rewrite_arg = i + 1;
       goto END_ARG;
       }


@@ -2226,6 +2226,7 @@ for (i = 1; i < argc; i++)
       printf("%s\n", CS version_copyright);
       version_printed = TRUE;
       show_whats_supported(stdout);
       printf("%s\n", CS version_copyright);
       version_printed = TRUE;
       show_whats_supported(stdout);

+      log_testing_mode = TRUE;

       }
 
     /* -bw: inetd wait mode, accept a listening socket as stdin */
       }
 
     /* -bw: inetd wait mode, accept a listening socket as stdin */


@@ -2561,12 +2562,12 @@ for (i = 1; i < argc; i++)
         if (temp >= argrest && *temp == '.') f_end_dot = TRUE;
         allow_domain_literals = TRUE;
         strip_trailing_dot = TRUE;
         if (temp >= argrest && *temp == '.') f_end_dot = TRUE;
         allow_domain_literals = TRUE;
         strip_trailing_dot = TRUE;

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

        allow_utf8_domains = TRUE;
 #endif
         sender_address = parse_extract_address(argrest, &errmess,
           &dummy_start, &dummy_end, &sender_address_domain, TRUE);
        allow_utf8_domains = TRUE;
 #endif
         sender_address = parse_extract_address(argrest, &errmess,
           &dummy_start, &dummy_end, &sender_address_domain, TRUE);

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

        message_smtputf8 =  string_is_utf8(sender_address);
        allow_utf8_domains = FALSE;
 #endif
        message_smtputf8 =  string_is_utf8(sender_address);
        allow_utf8_domains = FALSE;
 #endif


@@ -3736,15 +3737,48 @@ is equivalent to the ability to modify a setuid binary!
 This needs to happen before we read the main configuration. */
 init_lookup_list();
 
 This needs to happen before we read the main configuration. */
 init_lookup_list();
 

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

 if (running_in_test_harness) smtputf8_advertise_hosts = NULL;
 #endif
 
 /* Read the main runtime configuration data; this gives up if there
 is a failure. It leaves the configuration file open so that the subsequent
 if (running_in_test_harness) smtputf8_advertise_hosts = NULL;
 #endif
 
 /* Read the main runtime configuration data; this gives up if there
 is a failure. It leaves the configuration file open so that the subsequent

-configuration data for delivery can be read if needed. */
+configuration data for delivery can be read if needed.
+
+NOTE: immediatly after opening the configuration file we change the working
+directory to "/"! Later we change to $spool_directory. We do it there, because
+during readconf_main() some expansion takes place already. */
+
+/* Store the initial cwd before we change directories */
+if ((initial_cwd = os_getcwd(NULL, 0)) == NULL)
+  {
+  perror("exim: can't get the current working directory");
+  exit(EXIT_FAILURE);
+  }
+
+/* checking:
+    -be[m] expansion test        -
+    -b[fF] filter test           new
+    -bh[c] host test             -
+    -bmalware malware_test_file  new
+    -brt   retry test            new
+    -brw   rewrite test          new
+    -bt    address test          -
+    -bv[s] address verify        -
+   list_options:
+    -bP <option> (except -bP config, which sets list_config)
+
+If any of these options is set, we suppress warnings about configuration
+issues (currently about tls_advertise_hosts and keep_environment not being
+defined) */
+
+readconf_main(checking || list_options);
+
+/* Now in directory "/" */
+
+if (cleanup_environment() == FALSE)
+  log_write(0, LOG_PANIC_DIE, "Can't cleanup environment");

 
 

-readconf_main();

 
 /* If an action on specific messages is requested, or if a daemon or queue
 runner is being started, we need to know if Exim was called by an admin user.
 
 /* If an action on specific messages is requested, or if a daemon or queue
 runner is being started, we need to know if Exim was called by an admin user.


@@ -3900,20 +3934,23 @@ if (log_oneline)
 temporary files are created; Exim doesn't use these (apart from when delivering
 to MBX mailboxes), but called libraries such as DBM libraries may require them.
 If TMPDIR is found in the environment, reset it to the value defined in the
 temporary files are created; Exim doesn't use these (apart from when delivering
 to MBX mailboxes), but called libraries such as DBM libraries may require them.
 If TMPDIR is found in the environment, reset it to the value defined in the

-TMPDIR macro, if this macro is defined. */
+EXIM_TMPDIR macro, if this macro is defined.  For backward compatibility this
+macro may be called TMPDIR in old "Local/Makefile"s. It's converted to
+EXIM_TMPDIR by the build scripts.
+*/

 
 

-#ifdef TMPDIR
+#ifdef EXIM_TMPDIR

   {
   uschar **p;
   {
   uschar **p;

-  for (p = USS environ; *p != NULL; p++)
+  if (environ) for (p = USS environ; *p != NULL; p++)

     {
     if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&
     {
     if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&

-        Ustrcmp(*p+7, TMPDIR) != 0)
+        Ustrcmp(*p+7, EXIM_TMPDIR) != 0)

       {
       {

-      uschar *newp = malloc(Ustrlen(TMPDIR) + 8);
-      sprintf(CS newp, "TMPDIR=%s", TMPDIR);
+      uschar *newp = malloc(Ustrlen(EXIM_TMPDIR) + 8);
+      sprintf(CS newp, "TMPDIR=%s", EXIM_TMPDIR);

       *p = newp;
       *p = newp;

-      DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", TMPDIR);
+      DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", EXIM_TMPDIR);

       }
     }
   }
       }
     }
   }


@@ -3945,10 +3982,10 @@ else
     uschar **new;
     uschar **newp;
     int count = 0;
     uschar **new;
     uschar **newp;
     int count = 0;

-    while (*p++ != NULL) count++;
+    if (environ) while (*p++ != NULL) count++;

     if (envtz == NULL) count++;
     newp = new = malloc(sizeof(uschar *) * (count + 1));
     if (envtz == NULL) count++;
     newp = new = malloc(sizeof(uschar *) * (count + 1));

-    for (p = USS environ; *p != NULL; p++)
+    if (environ) for (p = USS environ; *p != NULL; p++)

       {
       if (Ustrncmp(*p, "TZ=", 3) == 0) continue;
       *newp++ = *p;
       {
       if (Ustrncmp(*p, "TZ=", 3) == 0) continue;
       *newp++ = *p;


@@ -4030,9 +4067,10 @@ if (((debug_selector & D_any) != 0 || LOGGING(arguments))
   {
   int i;
   uschar *p = big_buffer;
   {
   int i;
   uschar *p = big_buffer;

-  char * dummy;

   Ustrcpy(p, "cwd= (failed)");
   Ustrcpy(p, "cwd= (failed)");

-  dummy = /* quieten compiler */ getcwd(CS p+4, big_buffer_size - 4);
+
+  Ustrncpy(p + 4, initial_cwd, big_buffer_size-5);
+

   while (*p) p++;
   (void)string_format(p, big_buffer_size - (p - big_buffer), " %d args:", argc);
   while (*p) p++;
   while (*p) p++;
   (void)string_format(p, big_buffer_size - (p - big_buffer), " %d args:", argc);
   while (*p) p++;


@@ -4164,7 +4202,7 @@ real, but are permitted when checking things (-be, -bv, -bt, -bh, -bf, -bF).
 Note that authority for performing certain actions on messages is tested in the
 queue_action() function. */
 
 Note that authority for performing certain actions on messages is tested in the
 queue_action() function. */
 

-if (!trusted_caller && !checking && filter_test == FTEST_NONE)
+if (!trusted_caller && !checking)

   {
   sender_host_name = sender_host_address = interface_address =
     sender_ident = received_protocol = NULL;
   {
   sender_host_name = sender_host_address = interface_address =
     sender_ident = received_protocol = NULL;


@@ -4538,7 +4576,8 @@ if (list_options)
           (Ustrcmp(argv[i], "router") == 0 ||
            Ustrcmp(argv[i], "transport") == 0 ||
            Ustrcmp(argv[i], "authenticator") == 0 ||
           (Ustrcmp(argv[i], "router") == 0 ||
            Ustrcmp(argv[i], "transport") == 0 ||
            Ustrcmp(argv[i], "authenticator") == 0 ||

-           Ustrcmp(argv[i], "macro") == 0))
+           Ustrcmp(argv[i], "macro") == 0 ||
+           Ustrcmp(argv[i], "environment") == 0))

         {
         readconf_print(argv[i+1], argv[i], flag_n);
         i++;
         {
         readconf_print(argv[i+1], argv[i], flag_n);
         i++;


@@ -4551,11 +4590,18 @@ if (list_options)
 if (list_config)
   {
   set_process_info("listing config");
 if (list_config)
   {
   set_process_info("listing config");

-  readconf_print(US"config", NULL, FALSE);
+  readconf_print(US"config", NULL, flag_n);

   exim_exit(EXIT_SUCCESS);
   }
 
 
   exim_exit(EXIT_SUCCESS);
   }
 
 

+/* Initialise subsystems as required */
+#ifndef DISABLE_DKIM
+dkim_exim_init();
+#endif
+deliver_init();
+
+

 /* Handle a request to deliver one or more messages that are already on the
 queue. Values of msg_action other than MSG_DELIVER and MSG_LOAD are dealt with
 above. MSG_LOAD is handled with -be (which is the only time it applies) below.
 /* Handle a request to deliver one or more messages that are already on the
 queue. Values of msg_action other than MSG_DELIVER and MSG_LOAD are dealt with
 above. MSG_LOAD is handled with -be (which is the only time it applies) below.


@@ -4810,8 +4856,7 @@ if ((!smtp_input && sender_address == NULL) ||
   if (sender_address == NULL             /* No sender_address set */
        ||                                /*         OR            */
        (sender_address[0] != 0 &&        /* Non-empty sender address, AND */
   if (sender_address == NULL             /* No sender_address set */
        ||                                /*         OR            */
        (sender_address[0] != 0 &&        /* Non-empty sender address, AND */

-       !checking &&                      /* Not running tests, AND */
-       filter_test == FTEST_NONE))       /* Not testing a filter */
+       !checking))                       /* Not running tests, including filter tests */

     {
     sender_address = originator_login;
     sender_address_forced = FALSE;
     {
     sender_address = originator_login;
     sender_address_forced = FALSE;


@@ -4896,6 +4941,7 @@ Otherwise, if -bem was used, read a message from stdin. */
 
 if (expansion_test)
   {
 
 if (expansion_test)
   {

+  dns_init(FALSE, FALSE, FALSE);

   if (msg_action_arg > 0 && msg_action == MSG_LOAD)
     {
     uschar spoolname[256];  /* Not big_buffer; used in spool_read_header() */
   if (msg_action_arg > 0 && msg_action == MSG_LOAD)
     {
     uschar spoolname[256];  /* Not big_buffer; used in spool_read_header() */


@@ -5051,6 +5097,7 @@ if (host_checking)
     "**** This is not for real!\n\n",
       sender_host_address);
 
     "**** This is not for real!\n\n",
       sender_host_address);
 

+  memset(sender_host_cache, 0, sizeof(sender_host_cache));

   if (verify_check_host(&hosts_connection_nolog) == OK)
     BIT_CLEAR(log_selector, log_selector_size, Li_smtp_connection);
   log_write(L_smtp_connection, LOG_MAIN, "%s", smtp_get_connection_info());
   if (verify_check_host(&hosts_connection_nolog) == OK)
     BIT_CLEAR(log_selector, log_selector_size, Li_smtp_connection);
   log_write(L_smtp_connection, LOG_MAIN, "%s", smtp_get_connection_info());


@@ -5121,7 +5168,7 @@ if (mua_wrapper)
   deliver_drop_privilege = TRUE;
   queue_smtp = FALSE;
   queue_smtp_domains = NULL;
   deliver_drop_privilege = TRUE;
   queue_smtp = FALSE;
   queue_smtp_domains = NULL;

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

   message_utf8_downconvert = -1;       /* convert-if-needed */
 #endif
   }
   message_utf8_downconvert = -1;       /* convert-if-needed */
 #endif
   }


@@ -5225,6 +5272,7 @@ if (smtp_input)
   {
   smtp_in = stdin;
   smtp_out = stdout;
   {
   smtp_in = stdin;
   smtp_out = stdout;

+  memset(sender_host_cache, 0, sizeof(sender_host_cache));

   if (verify_check_host(&hosts_connection_nolog) == OK)
     BIT_CLEAR(log_selector, log_selector_size, Li_smtp_connection);
   log_write(L_smtp_connection, LOG_MAIN, "%s", smtp_get_connection_info());
   if (verify_check_host(&hosts_connection_nolog) == OK)
     BIT_CLEAR(log_selector, log_selector_size, Li_smtp_connection);
   log_write(L_smtp_connection, LOG_MAIN, "%s", smtp_get_connection_info());


@@ -5414,7 +5462,7 @@ while (more)
                 errors_sender_rc : EXIT_FAILURE;
             }
 
                 errors_sender_rc : EXIT_FAILURE;
             }
 

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

        {
        BOOL b = allow_utf8_domains;
        allow_utf8_domains = TRUE;
        {
        BOOL b = allow_utf8_domains;
        allow_utf8_domains = TRUE;


@@ -5422,7 +5470,7 @@ while (more)
         recipient =
           parse_extract_address(s, &errmess, &start, &end, &domain, FALSE);
 
         recipient =
           parse_extract_address(s, &errmess, &start, &end, &domain, FALSE);
 

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

        if (string_is_utf8(recipient))
          message_smtputf8 = TRUE;
        else
        if (string_is_utf8(recipient))
          message_smtputf8 = TRUE;
        else