tidying

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

diff --git a/src/src/string.c b/src/src/string.c
index 12666b734dfc32432f655637cd798c7b855da697..0dcf552e750be306878ca3c0a920cdc0caf07f51 100644 (file)
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -771,9 +771,9 @@ Returns:         pointer to substring in string, or NULL if not found
 */
 
 uschar *
-strstric(uschar * s, uschar * t, BOOL space_follows)
+strstric(const uschar * s, const uschar * t, BOOL space_follows)
 {
-uschar * p = t;
+const uschar * p = t;
 uschar * yield = NULL;
 int cl = tolower(*p);
 int cu = toupper(*p);
@@ -1139,6 +1139,7 @@ Returns:   growable string, changed if copied for expansion.
            Note that a NUL is not added, though space is left for one. This is
            because string_cat() is often called multiple times to build up a
            string - there's no point adding the NUL till the end.
+          NULL is a possible return.
 
 */
 /* coverity[+alloc] */
@@ -1152,6 +1153,7 @@ BOOL srctaint = is_tainted(s);
 if (count < 0)
   log_write(0, LOG_MAIN|LOG_PANIC_DIE,
     "internal error in string_catn (count %d)", count);
+if (count == 0) return g;
 
 if (!g)
   {