--------------------- PatchSet 5784 Date: 2007/09/12 08:21:32 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Misc ACLIP - prevent logical flow continuance after fatal errors. Members: src/ACLIP.cc:1.8.2.43->1.8.2.44 Index: squid3/src/ACLIP.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ACLIP.cc,v retrieving revision 1.8.2.43 retrieving revision 1.8.2.44 diff -u -r1.8.2.43 -r1.8.2.44 --- squid3/src/ACLIP.cc 25 Aug 2007 23:52:22 -0000 1.8.2.43 +++ squid3/src/ACLIP.cc 12 Sep 2007 08:21:32 -0000 1.8.2.44 @@ -1,5 +1,5 @@ /* - * $Id: ACLIP.cc,v 1.8.2.43 2007/08/25 23:52:22 amosjeffries Exp $ + * $Id: ACLIP.cc,v 1.8.2.44 2007/09/12 08:21:32 amosjeffries Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -310,8 +310,9 @@ memset(&hints, 0, sizeof(struct addrinfo)); - if( iptype != AF_UNSPEC ) + if( iptype != AF_UNSPEC ) { hints.ai_flags |= AI_NUMERICHOST; + } #if 0 && USE_IPV6 && !IPV6_SPECIAL_SPLITSTACK hints.ai_flags |= AI_V4MAPPED | AI_ALL; @@ -352,7 +353,7 @@ delete r; *Q = NULL; self_destruct(); - continue; + return NULL; } else debugs(28, 3, "aclIpParseIpData: Located Netmask '" << r->mask << "' in '" << t << "'"); @@ -365,6 +366,7 @@ if (*Q != NULL) { debugs(28, 0, "aclIpParseIpData: Bad host/IP: '" << t << "'"); self_destruct(); + return NULL; } xfreeaddrinfo(hp);