commit ef8c64acbe7b826b2bbd2dacc0e173cf79b26d37
author Maxim Dounin <mdounin@mdounin.ru> Mon Sep 30 22:10:13 2013 +0400
committer Maxim Dounin <mdounin@mdounin.ru> Mon Sep 30 22:10:13 2013 +0400
tree 9aef3e1e2f31c431ffc30b5d2ed66ac71033c07d
parent aa36cc39a40a8d6a1e5fbc7a527b1a39db790d01

Mail: fixed segfault with ssl/starttls at mail{} level and no cert.

A configuration like "mail { starttls on; server {}}" triggered NULL
pointer dereference in ngx_mail_ssl_merge_conf() as conf->file was not set.

src/mail/ngx_mail_ssl_module.c

diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index 66aa18c..18fd66a 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -235,6 +235,11 @@
        mode = "";
     }
 
+    if (conf->file == NULL) {
+        conf->file = prev->file;
+        conf->line = prev->line;
+    }
+
     if (*mode) {
 
         if (conf->certificate.len == 0) {