Mercurial > hg > nginx

changeset 5264:b6ffe53f9c3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Core: fixed possible use of an uninitialized variable. The call to ngx_sock_ntop() in ngx_connection_local_sockaddr() might be performed with the uninitialized "len" variable. The fix is to initialize variable to the size of corresponding socket address type. The issue was introduced in commit 05ba5bce31e0.
author Vladimir Homutov <vl@nginx.com>
date Thu, 11 Jul 2013 19:50:19 +0400
parents 05ba5bce31e0
children 9f17e765a21e
files src/core/ngx_connection.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_connection.c	Thu Jul 11 16:07:25 2013 +0400
+++ b/src/core/ngx_connection.c	Thu Jul 11 19:50:19 2013 +0400
@@ -1034,6 +1034,7 @@
 #if (NGX_HAVE_INET6)
     case AF_INET6:
         sin6 = (struct sockaddr_in6 *) c->local_sockaddr;
+        len = sizeof(struct sockaddr_in6);
 
         for (addr = 0, i = 0; addr == 0 && i < 16; i++) {
             addr |= sin6->sin6_addr.s6_addr[i];
@@ -1044,6 +1045,7 @@
 
     default: /* AF_INET */
         sin = (struct sockaddr_in *) c->local_sockaddr;
+        len = sizeof(struct sockaddr_in);
         addr = sin->sin_addr.s_addr;
         break;
     }