X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fexpand.c;h=2366eb8828f55f896e99ca093beaecdda28176c6;hp=fddad3179b09840d747cf353513fd6043e17d0a2;hb=298849d8ea217fd104d167f5233bd11240b3ddae;hpb=46d2a5e6f6e7709d172903b13945d23fc0a2c888

diff --git a/src/src/expand.c b/src/src/expand.c
index fddad3179..2366eb882 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4892,16 +4892,13 @@ while (*s != 0)
         if (mac_islookup(stype, lookup_querystyle))
           filename = NULL;
         else
-          {
-          if (*filename != '/')
-            {
-            expand_string_message = string_sprintf(
-              "absolute file name expected for \"%s\" lookup", name);
-            goto EXPAND_FAILED;
-            }
-          while (*key != 0 && !isspace(*key)) key++;
-          if (*key != 0) *key++ = 0;
-          }
+          if (*filename == '/')
+	    {
+	    while (*key && !isspace(*key)) key++;
+	    if (*key) *key++ = '\0';
+	    }
+	  else
+	    filename = NULL;
         }
 
       /* If skipping, don't do the next bit - just lookup_value == NULL, as if
@@ -5335,8 +5332,9 @@ while (*s != 0)
 	uschar * item;
 	int sep = 0;
 
-	item = string_nextinlist(&list, &sep, NULL, 0);
-        if ((timeout = readconf_readtime(item, 0, FALSE)) < 0)
+	if (  !(item = string_nextinlist(&list, &sep, NULL, 0))
+	   || !*item
+	   || (timeout = readconf_readtime(item, 0, FALSE)) < 0)
           {
           expand_string_message = string_sprintf("bad time value %s", item);
           goto EXPAND_FAILED;