Merge branch 'master' into scratch-3.0

Conflicts:

	Assemble.c
	config.c

1 files changed, 1 insertions, 1 deletions

diff --git a/config.c b/config.c
index 6ab5a346..7e09b5ca 100644
--- a/config.c
+++ b/config.c
@@ -600,7 +600,7 @@ void mailfromline(char *line)
 		else {
 			char *t = NULL;
 
-			if (asprintf(&t, "%s %s", alert_mail_from, w) > 0) {
+			if (xasprintf(&t, "%s %s", alert_mail_from, w) > 0) {
 				free(alert_mail_from);
 				alert_mail_from = t;
 			}