Tidying: coverity issues

diff --git a/src/src/acl.c b/src/src/acl.c
index 0ab6292e1c38bacb087042f3a08ebac70496bfd3..474b0d1819be12537f84228cb5c9cfc69458fbc2 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1159,11 +1159,11 @@ uschar *
 fn_hdrs_added(void)
 {
 uschar * ret = NULL;
+int size = 0;
+int ptr = 0;
 header_line * h = acl_added_headers;
 uschar * s;
 uschar * cp;
-int size = 0;
-int ptr = 0;
 
 if (!h) return NULL;
 

diff --git a/src/src/exim.c b/src/src/exim.c
index 46e856b7acceb181ab6f645688f20c67a04e78dc..490248917775b35e2272a67180409b1aacc2ddf3 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1272,9 +1272,10 @@ for (i = 0;; i++)
   if (fn_readline != NULL) free(readline_line);
   #endif
 
+  /* yield can only be NULL if ss==p */
   if (ss == p || yield[ptr-1] != '\\')
     {
-    yield[ptr] = 0;
+    if (yield) yield[ptr] = 0;
     break;
     }
   yield[--ptr] = 0;

diff --git a/src/src/expand.c b/src/src/expand.c
index 2419161002e2865d8a111f8bfb6c5b7e80d41e08..922519eb9bf9d78857bc3098d7a78f3fc83103b3 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -3851,8 +3851,8 @@ expand_string_internal(const uschar *string, BOOL ket_ends, const uschar **left,
 {
 int ptr = 0;
 int size = Ustrlen(string)+ 64;
-int item_type;
 uschar *yield = store_get(size);
+int item_type;
 const uschar *s = string;
 uschar *save_expand_nstring[EXPAND_MAXN+1];
 int save_expand_nlength[EXPAND_MAXN+1];

diff --git a/src/src/lookups/pgsql.c b/src/src/lookups/pgsql.c
index 53d17d7ad019dfdaef70b981a555e447967666ef..735f85554f3e1f779283f18cd281d9a2f61091af 100644 (file)
--- a/src/src/lookups/pgsql.c
+++ b/src/src/lookups/pgsql.c
@@ -125,11 +125,11 @@ PGconn *pg_conn = NULL;
 PGresult *pg_result = NULL;
 
 int i;
+uschar *result = NULL;
 int ssize = 0;
 int offset = 0;
 int yield = DEFER;
 unsigned int num_fields, num_tuples;
-uschar *result = NULL;
 pgsql_connection *cn;
 uschar *server_copy = NULL;
 uschar *sdata[3];