Mercurial > hg > nginx
comparison src/mail/ngx_mail_ssl_module.c @ 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 | d620f497c50f |
children |
comparison
equal
deleted
inserted
replaced
5419:66db21c0ac55 | 5420:3ff1e663fa08 |
---|---|
233 | 233 |
234 } else { | 234 } else { |
235 mode = ""; | 235 mode = ""; |
236 } | 236 } |
237 | 237 |
238 if (conf->file == NULL) { | |
239 conf->file = prev->file; | |
240 conf->line = prev->line; | |
241 } | |
242 | |
238 if (*mode) { | 243 if (*mode) { |
239 | 244 |
240 if (conf->certificate.len == 0) { | 245 if (conf->certificate.len == 0) { |
241 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | 246 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |
242 "no \"ssl_certificate\" is defined for " | 247 "no \"ssl_certificate\" is defined for " |