summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2013-09-30 22:10:08 +0400
committerMaxim Dounin <mdounin@mdounin.ru>2013-09-30 22:10:08 +0400
commit9f97a0c4f9dcf71279c283098ee4bf8c0e03c65a (patch)
tree48e90e519bf17cc891177e231ad79d4a7fc9af6b
parent2554b2842c81fcfcf287c632835759d6136705e8 (diff)
downloadnginx-9f97a0c4f9dcf71279c283098ee4bf8c0e03c65a.tar.gz
nginx-9f97a0c4f9dcf71279c283098ee4bf8c0e03c65a.tar.bz2
Mail: fixed overrun of allocated memory (ticket #411).
Reported by Markus Linnala.
-rw-r--r--src/mail/ngx_mail_smtp_module.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mail/ngx_mail_smtp_module.c b/src/mail/ngx_mail_smtp_module.c
index cdd4e5eb1..02bbf1fb9 100644
--- a/src/mail/ngx_mail_smtp_module.c
+++ b/src/mail/ngx_mail_smtp_module.c
@@ -277,7 +277,6 @@ ngx_mail_smtp_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
p = ngx_cpymem(p, conf->capability.data, conf->capability.len);
p = ngx_cpymem(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1);
- *p++ = CR; *p = LF;
p = conf->starttls_capability.data
+ (last - conf->capability.data) + 3;