Mercurial > hg > nginx
changeset 5420:3ff1e663fa08 stable-1.4
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 30 Sep 2013 22:10:13 +0400 |
parents | 66db21c0ac55 |
children | 69ffaca77955 |
files | src/mail/ngx_mail_ssl_module.c |
diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mail/ngx_mail_ssl_module.c Mon Sep 30 22:10:08 2013 +0400 +++ b/src/mail/ngx_mail_ssl_module.c Mon Sep 30 22:10:13 2013 +0400 @@ -235,6 +235,11 @@ mode = ""; } + if (conf->file == NULL) { + conf->file = prev->file; + conf->line = prev->line; + } + if (*mode) { if (conf->certificate.len == 0) {