Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 303)
+++ trunk/docs/Changelog	(revision 304)
@@ -1,3 +1,5 @@
 2.8.1:
+	* Fix null pointer dereference in config parse handler for SetMailAlias
+	  (reported by Sergey)
 	* Fix incorrect memset() in sh_kern.c (passed struct by value...),
 	  reported by Roman and Stefan
Index: trunk/src/sh_nmail.c
===================================================================
--- trunk/src/sh_nmail.c	(revision 303)
+++ trunk/src/sh_nmail.c	(revision 304)
@@ -234,7 +234,8 @@
 	      SH_FREE(array);
 
-	      if (newalias && newalias->recipient_list == NULL)
+	      if (newalias == NULL || newalias->recipient_list == NULL)
 		{
-		  SH_FREE(newalias);
+		  if (newalias)
+		    SH_FREE(newalias);
 		  goto err;
 		}