]> git.kaiwu.me - nginx.git/commitdiff
Mail: fixed buffer allocation for CRLF after Auth-SMTP-* headers.
authorMaxim Dounin <mdounin@mdounin.ru>
Wed, 25 Feb 2015 14:47:43 +0000 (17:47 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Wed, 25 Feb 2015 14:47:43 +0000 (17:47 +0300)
There were no buffer overruns in real life as there is extra space
allocated for the Auth-Login-Attempt counter.

src/mail/ngx_mail_auth_http_module.c

index eb7531c80a3d48a495e6bdfb02661cb45056729f..f040ec1944a8363ba927b1938c3b595934f27cd2 100644 (file)
@@ -1170,9 +1170,9 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
           + sizeof("Client-IP: ") - 1 + s->connection->addr_text.len
                 + sizeof(CRLF) - 1
           + sizeof("Client-Host: ") - 1 + s->host.len + sizeof(CRLF) - 1
-          + sizeof("Auth-SMTP-Helo: ") - 1 + s->smtp_helo.len
-          + sizeof("Auth-SMTP-From: ") - 1 + s->smtp_from.len
-          + sizeof("Auth-SMTP-To: ") - 1 + s->smtp_to.len
+          + sizeof("Auth-SMTP-Helo: ") - 1 + s->smtp_helo.len + sizeof(CRLF) - 1
+          + sizeof("Auth-SMTP-From: ") - 1 + s->smtp_from.len + sizeof(CRLF) - 1
+          + sizeof("Auth-SMTP-To: ") - 1 + s->smtp_to.len + sizeof(CRLF) - 1
           + ahcf->header.len
           + sizeof(CRLF) - 1;