Allocate exception buffer even if status.mf is not required

This fixes coredumps caused by calls to MF_THROW from built-in functions
in scripts without the 'require status' statement.

* src/exclist.c (fixup_exceptions): New function
* src/mailfromd.h (fixup_exceptions): New proto.
* src/gram.y: Call fixup_exceptions before setting up dataseg.

3 files changed, 18 insertions, 1 deletions

diff --git a/src/exclist.c b/src/exclist.c
index 40a8074b..f7e8577f 100644
--- a/src/exclist.c
+++ b/src/exclist.c
@@ -53,10 +53,25 @@ define_exception(struct literal *lit, struct mu_locus_range const *locus)
 }
 
 void
+fixup_exceptions(void)
+{
+	char namebuf[128];
+	struct mu_locus_range locus = MU_LOCUS_RANGE_INITIALIZER;
+	mu_locus_point_set_file(&locus.beg, __FILE__);	
+	locus.beg.mu_line = __LINE__;
+	while (exception_count < mf_exception_count) {
+		snprintf(namebuf, sizeof namebuf, "#%d", exception_count);
+		define_exception(string_alloc(namebuf, strlen(namebuf)),
+				 &locus);
+	}
+	mu_locus_range_deinit(&locus);
+}		
+
+void
 enumerate_exceptions(int (*efn)(const struct constant *cp,
 				const struct literal *lit,
 				void *data),
-		     void *data)
+ 		     void *data)
 {
 	struct exclist *p;
 
diff --git a/src/gram.y b/src/gram.y
index 2de129ed..bc1d2c39 100644
--- a/src/gram.y
+++ b/src/gram.y
@@ -489,6 +489,7 @@ input      : program
                              if (error_count)
                                      YYERROR;
                              apply_deferred_init();
+			     fixup_exceptions();
                              dataseg_layout();
                              if (optimization_level)
                                      regex_layout();
diff --git a/src/mailfromd.h b/src/mailfromd.h
index 527d4f96..5cc7136b 100644
--- a/src/mailfromd.h
+++ b/src/mailfromd.h
@@ -936,6 +936,7 @@ void enumerate_exceptions(int (*efn)(const struct constant *cp,
 				     const struct literal *lit,
 				     void *data),
 			  void *data);
+void fixup_exceptions(void);
 void free_exceptions(void);