From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 30 Sep 2013 18:10:08 +0000 (+0400)
Subject: Mail: fixed overrun of allocated memory (ticket #411).
X-Git-Tag: release-1.4.3~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=9f97a0c4f9dcf71279c283098ee4bf8c0e03c65a;p=nginx.git

Mail: fixed overrun of allocated memory (ticket #411).

Reported by Markus Linnala.
---

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;