diff options
| author | Magnus Holmgren <holmgren@lysator.liu.se> | 2006-12-24 12:12:05 +0000 |
|---|---|---|
| committer | Magnus Holmgren <holmgren@lysator.liu.se> | 2006-12-24 12:12:05 +0000 |
| commit | d606654836e3c791e69d4e5f066ef9d8e60ba035 (patch) | |
| tree | e2b8572fd3c71ba9d99582ac40dd386efd67b241 | |
| parent | 49e2c2f1dec29b4fee1b0c18b754431753c6a027 (diff) | |
Don't check that the operands of numeric comparison operators are integers when yield == NULL
| -rw-r--r-- | doc/doc-txt/ChangeLog | 6 | ||||
| -rw-r--r-- | src/src/expand.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 3e9b5a8a0..8c606107d 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.448 2006/12/20 19:57:47 tom Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.449 2006/12/24 12:12:05 magnus Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -10,6 +10,10 @@ TK/01 Disable default definition of HAVE_LINUX_SENDFILE. Clashes with Linux large file support (_FILE_OFFSET_BITS=64) on older glibc versions. (#438) +MH/01 Don't check that the operands of numeric comparison operators are + integers when their expansion is in "skipping" mode (fixes bug + introduced by 4.64-PH/07). + Exim version 4.64 ----------------- diff --git a/src/src/expand.c b/src/src/expand.c index 7f1515c98..2d3f56754 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/expand.c,v 1.73 2006/12/05 11:35:28 ph10 Exp $ */ +/* $Cambridge: exim/src/src/expand.c,v 1.74 2006/12/24 12:12:05 magnus Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -1986,7 +1986,7 @@ switch(cond_type) conditions that compare numbers do not start with a letter. This just saves checking for them individually. */ - if (!isalpha(name[0])) + if (!isalpha(name[0]) && yield != NULL) { num[i] = expand_string_integer(sub[i], FALSE); if (expand_string_message != NULL) return NULL; |