summaryrefslogtreecommitdiff
path: root/network_io
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2004-05-21 22:21:13 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2004-05-21 22:21:13 +0000
commit8e73fed544daaf9f7322452eb983e83c61ec1b20 (patch)
treee2d9e8cdcf16c4a7369ad51ac6a03147f8f78609 /network_io
parentccfd11052862e51607872a6fb7996038b4d5fc2b (diff)
downloadlibapr-8e73fed544daaf9f7322452eb983e83c61ec1b20.tar.gz
Fix stack overflow with IPv6 apr_socket_accept() on Win32.
PR: 28471 Submitted by: inoue <inoue ariel-networks.com> Reviewed by: Jeff Trawick git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65108 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
-rw-r--r--network_io/win32/sockets.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/network_io/win32/sockets.c b/network_io/win32/sockets.c
index 00cb9ae56..d194a5bc0 100644
--- a/network_io/win32/sockets.c
+++ b/network_io/win32/sockets.c
@@ -212,7 +212,11 @@ APR_DECLARE(apr_status_t) apr_socket_accept(apr_socket_t **new,
apr_socket_t *sock, apr_pool_t *p)
{
SOCKET s;
+#if APR_HAVE_IPV6
+ struct sockaddr_storage sa;
+#else
struct sockaddr sa;
+#endif
int salen = sizeof(sock->remote_addr->sa);
/* Don't allocate the memory until after we call accept. This allows