magnus 2006/12/24 12:12:05 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src expand.c
Log:
Don't check that the operands of numeric comparison operators are integers when yield == NULL
Revision Changes Path
1.449 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.74 +1 -1 exim/exim-src/src/expand.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- ChangeLog 20 Dec 2006 19:57:47 -0000 1.448
+++ ChangeLog 24 Dec 2006 12:12:05 -0000 1.449
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.448 2006/12/20 19:57:47 tom Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -9,6 +9,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
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- expand.c 5 Dec 2006 11:35:28 -0000 1.73
+++ expand.c 24 Dec 2006 12:12:05 -0000 1.74
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.73 2006/12/05 11:35:28 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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;
