mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-25 06:37:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
A configuration like "mail { starttls on; server {}}" triggered NULL
pointer dereference in ngx_mail_ssl_merge_conf() as conf->file was not set.
This commit is contained in:
Maxim Dounin 2013-09-30 22:10:13 +04:00
parent 9f97a0c4f9
commit 2638cef719
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mail/ngx_mail_ssl_module.c
View File

@ -235,6 +235,11 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
mode = ""; mode = "";
} }
if (conf->file == NULL) {
conf->file = prev->file;
conf->line = prev->line;
}
if (*mode) { if (*mode) {
if (conf->certificate.len == 0) { if (conf->certificate.len == 0) {