Fix pointer bug when freeing ASN ACLs

diff --git a/src/acl.cc b/src/acl.cc
index 72a303273242dbc7e042086dea44af8f37f6952c..062dd3b73ca10de45f8871438f5fb67cf6a03a21 100644 (file)
--- 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 1f9e710c5ae896728d34f072ac4b7f0c0fa0b9f5..036f7436774f121ece1350438446397617963d45 100644 (file)
--- 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;
 };