git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Filters: fix "vacation" in Exim filter. Bug 2593
[users/jgh/exim.git]
/
src
/
src
/
transports
/
autoreply.c
diff --git
a/src/src/transports/autoreply.c
b/src/src/transports/autoreply.c
index 2b487b435a62b66f1f61701bf775f42e44a9520f..865abbf4f555b73b005817027da9a001fc557be2 100644
(file)
--- a/
src/src/transports/autoreply.c
+++ b/
src/src/transports/autoreply.c
@@
-3,6
+3,7
@@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-202,7
+203,7
@@
while (*s != 0)
/* If there is some kind of syntax error, just give up on this header
line. */
/* If there is some kind of syntax error, just give up on this header
line. */
- if (
next == NULL
) break;
+ if (
!next
) break;
/* See if the address is on the never_mail list */
/* See if the address is on the never_mail list */
@@
-473,10
+474,10
@@
if (oncelog && *oncelog && to)
else
{
EXIM_DATUM key_datum, result_datum;
else
{
EXIM_DATUM key_datum, result_datum;
- uschar * dirname = string_copy(oncelog);
- uschar * s;
+ uschar * dirname, * s;
- if ((s = Ustrrchr(dirname, '/'))) *s = '\0';
+ dirname = (s = Ustrrchr(oncelog, '/'))
+ ? string_copyn(oncelog, s - oncelog) : NULL;
EXIM_DBOPEN(oncelog, dirname, O_RDWR|O_CREAT, ob->mode, &dbm_file);
if (!dbm_file)
{
EXIM_DBOPEN(oncelog, dirname, O_RDWR|O_CREAT, ob->mode, &dbm_file);
if (!dbm_file)
{