git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix argument checking for ${readsocket }
[exim.git]
/
src
/
src
/
expand.c
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 4377ea1aa2ed9e518a8047e8584e962674fa9126..f937ac33743be2d2802df40bb5e1839bc740c7bc 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-5335,8
+5335,9
@@
while (*s != 0)
uschar * item;
int sep = 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;
{
expand_string_message = string_sprintf("bad time value %s", item);
goto EXPAND_FAILED;
@@
-5624,7
+5625,8
@@
while (*s != 0)
/* Create the child process, making it a group leader. */
/* Create the child process, making it a group leader. */
- if ((pid = child_open(USS argv, NULL, 0077, &fd_in, &fd_out, TRUE)) < 0)
+ if ((pid = child_open(USS argv, NULL, 0077, &fd_in, &fd_out, TRUE,
+ US"expand-run")) < 0)
{
expand_string_message =
string_sprintf("couldn't create child process: %s", strerror(errno));
{
expand_string_message =
string_sprintf("couldn't create child process: %s", strerror(errno));