8 files changed, 270 insertions, 120 deletions

diff --git a/ChangeLog b/ChangeLog
index 3602649b..5ab79460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-08  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+        * src/snarf.m4, src/bi_sprintf.m4, src/prog.h, src/bi_sieve.m4,
+        Ported r1655 from trunk.
+
+        * src/prog.c: Ported r1655 and r1660 from trunk.
+
+        * NEWS: Update, set version number 4.4.1.
+        * configure.ac: set version number 4.4.1.
+
 2008-03-10  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         * doc/mailfromd.texi: Spell check. Add missing acknowledgments.
diff --git a/NEWS b/NEWS
index 674dbae4..a212fcc2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,15 @@
-Mailfromd NEWS -- history of user-visible changes. 2008-03-10
+Mailfromd NEWS -- history of user-visible changes. 2008-09-09
 Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send mailfromd bug reports to <bug-mailfromd@gnu.org.ua>
 
 
+Version 4.4.1
+
+* Fix stack reallocation.
+
+
 Version 4.4, 2008-03-10
 
 * The --domain option is withdrawn.
diff --git a/configure.ac b/configure.ac
index 5a146171..5a6e224c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 AC_PREREQ(2.59)
 m4_define([MF_VERSION_MAJOR], 4)
 m4_define([MF_VERSION_MINOR], 4)
-dnl m4_define([MF_VERSION_PATCH], 0)
+m4_define([MF_VERSION_PATCH], 1)
 AC_INIT([mailfromd],
         MF_VERSION_MAJOR.MF_VERSION_MINOR[]m4_ifdef([MF_VERSION_PATCH],.MF_VERSION_PATCH),
         [bug-mailfromd@gnu.org.ua])
diff --git a/src/bi_sieve.m4 b/src/bi_sieve.m4
index 04ae8f95..0c5af274 100644
--- a/src/bi_sieve.m4
+++ b/src/bi_sieve.m4
@@ -151,7 +151,7 @@ MF_DEFUN(sieve, NUMBER, STRING script, OPTIONAL, NUMBER dbg)
                 mu_sieve_set_logger(mach, _sieve_action_log);
 
         rc = mu_sieve_compile(mach, script);
-        if (rc == 0){
+        if (rc == 0) {
                 mu_stream_t mstr = env_get_stream(env);
                 mu_attribute_t attr;
                 mu_message_t msg;
diff --git a/src/bi_sprintf.m4 b/src/bi_sprintf.m4
index afd63d32..051d2dc4 100644
--- a/src/bi_sprintf.m4
+++ b/src/bi_sprintf.m4
@@ -150,8 +150,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                         if (isdigit(*p)) {
                                 char *q = get_num(p, &n);
                                 if (*q == '$') {
-                                        num = (unsigned) MF_VA_ARG(n-1,
-                                                                   NUMBER);
+                                        MF_VA_ARG(n-1, NUMBER, num);
                                         p = q + 1;
                                         if (num < 0) {
                                                 flags |= FMT_SPACEPFX;
@@ -161,7 +160,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                         break;
                                 }
                         }
-                        num = MF_VA_ARG(i, NUMBER);
+                        MF_VA_ARG(i, NUMBER, num);
                         i++;
                         if (num < 0) {
                                 /* A negative field width is taken
@@ -193,14 +192,14 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                         if (isdigit(*p)) {
                                 char *q = get_num(p, &n);
                                 if (*q == '$') {
-                                        num = MF_VA_ARG(n-1, NUMBER);
+                                        MF_VA_ARG(n-1, NUMBER, num);
                                         if (num > 0)
                                                 prec = (unsigned) num;
                                         p = q + 1;
                                         break;
                                 }
                         }
-                        num = MF_VA_ARG(i, NUMBER);
+                        MF_VA_ARG(i, NUMBER, num);
                         i++;
                         if (num > 0)
                                 prec = (unsigned) num;
@@ -211,7 +210,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                 argnum = i++;
                         switch (*p) {
                         case 's':
-                                str = MF_VA_ARG(argnum,STRING);
+                                MF_VA_ARG(argnum, STRING, str);
                                 n = strlen(str);
                                 if (prec && prec < n)
                                         n = prec;
@@ -235,7 +234,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
 
                         case 'i':
                         case 'd':
-                                num = MF_VA_ARG(argnum,NUMBER);
+                                MF_VA_ARG(argnum, NUMBER, num);
                                 if (num < 0) {
                                         negative = 1;
                                         num = - num;
@@ -290,7 +289,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                 break;
 
                         case 'u':
-                                num = MF_VA_ARG(argnum,NUMBER);
+                                MF_VA_ARG(argnum, NUMBER, num);
                                 /* If a precision is given with a
                                    numeric conversion, the 0 flag is ignored.
                                 */
@@ -323,7 +322,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
 
                         case 'x':
                         case 'X':
-                                num = MF_VA_ARG(argnum,NUMBER);
+                                MF_VA_ARG(argnum, NUMBER, num);
                                 /* If a precision is given with a
                                    numeric conversion, the 0 flag is ignored.
                                 */
@@ -369,7 +368,7 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                 break;
                                 
                         case 'o':
-                                num = MF_VA_ARG(argnum,NUMBER);
+                                MF_VA_ARG(argnum, NUMBER, num);
                                 /* If a precision is given with a
                                    numeric conversion, the 0 flag is ignored.
                                 */
diff --git a/src/prog.c b/src/prog.c
index 26621102..9dc17daa 100644
--- a/src/prog.c
+++ b/src/prog.c
@@ -235,6 +235,10 @@ disable_prog_trace(const char *modlist)
 
 /* Run-time evaluation */
 
+/* Max. number of C locals to save in struct eval_environ for eventual fixups.
+   See comment to env_fixup_autos, below. */
+#define MAX_AUTO_PTR 128 
+
 struct eval_environ {
         prog_counter_t pc;     /* Program counter */
 
@@ -253,6 +257,10 @@ struct eval_environ {
         /* Temporary heap space */
         size_t temp_start;
         size_t temp_size;
+
+        STKVAL *auto_ptr[MAX_AUTO_PTR]; /* Pointers to C automatic variables
+                                           referring to dataseg. */
+        size_t numautos;                /* Number of entries in auto_ptr. */
         
         /* Sendmail interaction data: */
         SMFICTX *ctx;          /* Milter Context */
@@ -328,12 +336,52 @@ env_get_stream(eval_environ_t env)
         return env->stream;
 }
 
+
+/* A call to expand_dataseg (see below) invalidates any C variables that
+   pointed to dataseg before the call. To avoid dereferencing invalid memory
+   pointers, the addresses of such C variables are stored in env->auto_ptr
+   using env_register_auto (it is done by get_string_arg). When
+   expand_dataseg is called, it calls env_fixup_autos and passes it the
+   offset of new dataseg from old one. env_fixup_autos adds this value to
+   every address in auto_ptr, thereby fixing them.
+
+   The auto_ptr array is cleared (by calling env_unregister_autos) after
+   executing each instruction (see eval_environment).