From: wessels <>
Date: Sat, 3 Jan 1998 02:52:23 +0000 (+0000)
Subject: Fix pointer bug when freeing ASN ACLs
X-Git-Tag: SQUID_3_0_PRE1~4285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fdbeb4fff637d431061c8d9e80e08e969694ac9;p=thirdparty%2Fsquid.git

Fix pointer bug when freeing ASN ACLs
---

diff --git a/src/acl.cc b/src/acl.cc
index 72a3032732..062dd3b73c 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.cc,v 1.125 1997/12/30 21:58:05 kostas Exp $
+ * $Id: acl.cc,v 1.126 1998/01/02 19:52:23 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -697,6 +697,8 @@ aclParseAclLine(acl ** head)
 	aclParseRegexList(&A->data);
 	break;
     case ACL_URL_PORT:
+    case ACL_SRC_ASN:
+    case ACL_DST_ASN:
 	aclParseIntlist(&A->data);
 	break;
     case ACL_USER:
@@ -715,10 +717,6 @@ aclParseAclLine(acl ** head)
     case ACL_PROXY_AUTH:
 	aclParseProxyAuth(&A->data);
 	break;
-    case ACL_SRC_ASN:
-    case ACL_DST_ASN:
-	aclParseIntlist(&A->data);
-	break;
 #if USE_ARP_ACL
     case ACL_SRC_ARP:
 	aclParseArpList(&A->data);
@@ -1602,15 +1600,13 @@ aclDestroyAcls(acl ** head)
 	case ACL_URL_PORT:
 	case ACL_PROTO:
 	case ACL_METHOD:
+	case ACL_SRC_ASN:
+	case ACL_DST_ASN:
 	    intlistDestroy((intlist **) & a->data);
 	    break;
 	case ACL_PROXY_AUTH:
 	    aclDestroyProxyAuth(a->data);
 	    break;
-	case ACL_SRC_ASN:
-	case ACL_DST_ASN:
-	    intlistDestroy(a->data);
-	    break;
 	case ACL_NONE:
 	default:
 	    assert(0);
diff --git a/src/asn.cc b/src/asn.cc
index 1f9e710c5a..036f743677 100644
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -55,7 +55,6 @@ struct _whoisState {
  * enhancements (e.g. expires)
  */
 struct _as_info {
-    void *x;
     intlist *as_number;
     time_t expires;
 };