* src/snarf.m4, src/bi_sprintf.m4, src/prog.h, src/bi_sieve.m4,release_4_4_patches

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.


git-svn-id: file:///svnroot/mailfromd/branches/release_4_4_patches@1661 7a8a7f39-df28-0410-adc6-e0d955640f24

8 files changed, 270 insertions, 120 deletions

diff --git a/ChangeLog b/ChangeLog
index 3602649b..5ab79460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,11 @@
+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>
diff --git a/NEWS b/NEWS
index 674dbae4..a212fcc2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-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
@@ -7,2 +7,7 @@ Please send mailfromd bug reports to <bug-mailfromd@gnu.org.ua>
 
+Version 4.4.1
+
+* Fix stack reallocation.
+
+
 Version 4.4, 2008-03-10
diff --git a/configure.ac b/configure.ac
index 5a146171..5a6e224c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,3 +19,3 @@ 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],
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
@@ -153,3 +153,3 @@ MF_DEFUN(sieve, NUMBER, STRING script, OPTIONAL, NUMBER dbg)
         rc = mu_sieve_compile(mach, script);
-        if (rc == 0){
+        if (rc == 0) {
                 mu_stream_t mstr = env_get_stream(env);
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
@@ -152,4 +152,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                 if (*q == '$') {
-                                        num = (unsigned) MF_VA_ARG(n-1,
-                                                                   NUMBER);
+                                        MF_VA_ARG(n-1, NUMBER, num);
                                         p = q + 1;
@@ -163,3 +162,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                         }
-                        num = MF_VA_ARG(i, NUMBER);
+                        MF_VA_ARG(i, NUMBER, num);
                         i++;
@@ -195,3 +194,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                                 if (*q == '$') {
-                                        num = MF_VA_ARG(n-1, NUMBER);
+                                        MF_VA_ARG(n-1, NUMBER, num);
                                         if (num > 0)
@@ -202,3 +201,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                         }
-                        num = MF_VA_ARG(i, NUMBER);
+                        MF_VA_ARG(i, NUMBER, num);
                         i++;
@@ -213,3 +212,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                         case 's':
-                                str = MF_VA_ARG(argnum,STRING);
+                                MF_VA_ARG(argnum, STRING, str);
                                 n = strlen(str);
@@ -237,3 +236,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                         case 'd':
-                                num = MF_VA_ARG(argnum,NUMBER);
+                                MF_VA_ARG(argnum, NUMBER, num);
                                 if (num < 0) {
@@ -292,3 +291,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                         case 'u':
-                                num = MF_VA_ARG(argnum,NUMBER);
+                                MF_VA_ARG(argnum, NUMBER, num);
                                 /* If a precision is given with a
@@ -325,3 +324,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                         case 'X':
-                                num = MF_VA_ARG(argnum,NUMBER);
+                                MF_VA_ARG(argnum, NUMBER, num);
                                 /* If a precision is given with a
@@ -371,3 +370,3 @@ MF_DEFUN_VARARGS(sprintf, STRING, STRING format)
                         case 'o':
-                                num = MF_VA_ARG(argnum,NUMBER);
+                                MF_VA_ARG(argnum, NUMBER, num);
                                 /* If a precision is given with a
diff --git a/src/prog.c b/src/prog.c
index 26621102..9dc17daa 100644
--- a/src/prog.c
+++ b/src/prog.c
@@ -237,2 +237,6 @@ disable_prog_trace(const char *modlist)
 
+/* 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 {
@@ -255,2 +259,6 @@ struct eval_environ {
         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. */
         
@@ -330,2 +338,40 @@ env_get_stream(eval_environ_t env)
 
+
+/* 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). 
+ */
+void
+env_register_auto(eval_environ_t env, void *ptr)
+{
+        if (env->numautos == MAX_AUTO_PTR)
+                runtime_error(env, "INTERNAL ERROR at %s:%d, please report",
+                              __FILE__, __LINE__);
+        env->auto_ptr[env->numautos++] = ptr;
+}
+
+void
+env_unregister_autos(eval_environ_t env)
+{
+        env->numautos = 0;
+}
+
+void
+env_fixup_autos(eval_environ_t env, ptrdiff_t offset)
+{
+        int i;
+        for (i = 0; i < env->numautos; i++) {
+                STKVAL *pptr = env->auto_ptr[i];
+                *pptr += offset;
+        }
+}
+
+
 #define STACK_EXPAND_BLOCK 64
@@ -336,2 +382,4 @@ expand_dataseg(eval_environ_t env, size_t count, const char *errtext)
         STKVAL *newds;
+        ptrdiff_t offset;
+        
         count = ((count + STACK_EXPAND_BLOCK - 1) / STACK_EXPAND_BLOCK)
@@ -348,2 +396,3 @@ expand_dataseg(eval_environ_t env, size_t count, const char *errtext)
 
+        offset = (char*)newds - (char*)env->dataseg;
         env->dataseg = newds;
@@ -355,2 +404,3 @@ expand_dataseg(eval_environ_t env, size_t count, const char *errtext)
                   * sizeof newds[0]);
+        env_fixup_autos(env, offset);
         mu_error(_("Warning: stack segment expanded, new size=%lu"),
@@ -464,6 +514,7 @@ get_immediate(eval_environ_t env, unsigned n)
 
-const char *
-get_literal(eval_environ_t env, unsigned n)
+void
+get_literal(eval_environ_t env, unsigned n, const char **p)
 {
-        return (char*)(env->dataseg + (size_t) get_immediate(env, n));
+        *p = (char*)(env->dataseg + (size_t) get_immediate(env, n));
+        env_register_auto(env, p);
 }
@@ -476,12 +527,19 @@ get_arg(eval_environ_t env, unsigned n)
 
-char *
-get_string_arg(eval_environ_t env, unsigned n)
+void
+get_string_arg(eval_environ_t env, unsigned n, char **p)
 {
-        return (char*) (env->dataseg + (size_t) get_arg(env, n));
+        *p = (char*) (env->dataseg + (size_t) get_arg(env, n));
+        env_register_auto(env, p);
 }
 
-size_t 
-get_numeric_arg(eval_environ_t env, unsigned n)
+void
+get_numeric_arg(eval_environ_t env, unsigned n, long *np)
 {
-        return (size_t) get_arg(env, n);
+        *np = (long) get_arg(env, n);
+}
+
+void
+get_pointer_arg(eval_environ_t env, unsigned n, void **p)
+{
+        *p = (void*) get_arg(env, n);
 }
@@ -491,6 +549,5 @@ push(eval_environ_t env, STKVAL val)
 {
-        if (env->tos < env->toh)
+        if (env->tos < env->toh) 
                 runtime_error(env, "INTERNAL ERROR at %s:%d, please report",
                               __FILE__, __LINE__);
-
         if (env->tos == env->toh) {
@@ -593,4 +650,4 @@ instr_locus(eval_environ_t env)
 {