Fixed snmp memleaks

diff --git a/include/util.h b/include/util.h
index c77f0b806c0abffd426ffb643aa2e3beeaebfd7b..d27dce2309d4eda90ceeada887bc6be83d53e455 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.41 1998/02/23 13:04:40 rousskov Exp $
+ * $Id: util.h,v 1.42 1998/02/26 22:16:26 kostas Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -127,6 +127,10 @@
 #endif
 #endif
 
+#if defined(_SQUID_FREEBSD_)
+#define _etext etext
+#endif
+
 extern const char *getfullhostname(void);
 extern const char *mkhttpdlogtime(const time_t *);
 extern const char *mkrfc1123(time_t);

diff --git a/lib/util.c b/lib/util.c
index 083bca4903bce7315a738d929dd11a235a59253b..36350d17a6598e2b4368cfbe3d738b61452bb873 100644 (file)
--- a/lib/util.c
+++ b/lib/util.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: util.c,v 1.45 1998/02/21 00:56:39 rousskov Exp $
+ * $Id: util.c,v 1.46 1998/02/26 22:16:26 kostas Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived
@@ -28,6 +28,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *  
  */
+#define _etext etext
 
 /*
  * Copyright (c) 1994, 1995.  All rights reserved.
@@ -410,6 +411,7 @@ xmalloc_find_leaks(void)
 {
     int B, I;
     int leak_sum = 0;
+
     extern void _etext;
     fprintf(stderr, "----- Memory map ----\n");
     xmalloc_scan_region(&_etext, (void *) sbrk(0) - (void *) &_etext, 0);

diff --git a/snmplib/snmp_vars.c b/snmplib/snmp_vars.c
index 61ef2f0f3b67b543deaa01809fcfc653ced96735..1074257abeff51c9c26ed1d1e4ec2b88ba8784cd 100644 (file)
--- a/snmplib/snmp_vars.c
+++ b/snmplib/snmp_vars.c
@@ -238,6 +238,9 @@ void snmp_var_free(struct variable_list *Ptr)
 
   if (Ptr->val.string && Ptr->val_len > 0)
     xfree((char *) Ptr->val.string);
+  else
+  if (Ptr->val.integer && Ptr->val_len > 0)
+    xfree((char *) Ptr->val.integer);
 
   xfree(Ptr);
 }

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 1e271dc0ccac05527f3e287678ac9573aaf00a35..9b015efc58b8e359476e31cd9ccc077d766d9884 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.87 1998/02/26 18:00:43 wessels Exp $
+ * $Id: fqdncache.cc,v 1.88 1998/02/26 22:16:28 kostas Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -973,9 +973,6 @@ snmp_fqdncacheFn(variable_list * Var, long *ErrP)
     default:
        *ErrP = SNMP_ERR_NOSUCHNAME;
        snmp_var_free(Answer);
-#if 0
-       xfree(Answer->val.integer);
-#endif
        return (NULL);
     }
     return Answer;

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 0c0a01968ab62c4bdd671a4edf42602de79c7dc7..d1ba8ebb14195ca2c1dd466bee87834cb1f8e4bd 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.162 1998/02/26 18:00:44 wessels Exp $
+ * $Id: ipcache.cc,v 1.163 1998/02/26 22:16:28 kostas Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -1112,7 +1112,6 @@ snmp_ipcacheFn(variable_list * Var, long *ErrP)
     default:
        *ErrP = SNMP_ERR_NOSUCHNAME;
        snmp_var_free(Answer);
-       xfree(Answer->val.integer);
        return (NULL);
     }
     return Answer;

diff --git a/src/net_db.cc b/src/net_db.cc
index 7f5d1f382187fab4c2a473b12289f6880808a042..3a532fab53fad831ebe9c68eb6d2a7769076365a 100644 (file)
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: net_db.cc,v 1.70 1998/02/26 18:00:47 wessels Exp $
+ * $Id: net_db.cc,v 1.71 1998/02/26 22:16:29 kostas Exp $
  *
  * DEBUG: section 37    Network Measurement Database
  * AUTHOR: Duane Wessels
@@ -787,7 +787,6 @@ snmp_netdbFn(variable_list * Var, long *ErrP)
     default:
        *ErrP = SNMP_ERR_NOSUCHNAME;
        snmp_var_free(Answer);
-       xfree(Answer->val.integer);
        return (NULL);
     }
 #endif

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index e31f01b02c4641e0dc698ecaf92f2366a948200b..f0de775ad10bac272f6a6c72a2b87c0fa722db15 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -110,7 +110,7 @@ snmpAclCheckDone(int answer, void *data)
            return;
        }
     }
-    Session->community = xstrdup(Community);
+    Session->community = Community;
     Session->community_len = strlen(Community);
     RespPDU = snmp_agent_response(PDU);
     snmp_free_pdu(PDU);
@@ -765,7 +765,6 @@ snmp_prfPeerFn(variable_list * Var, long *ErrP)
     default:
        *ErrP = SNMP_ERR_NOSUCHNAME;
        snmp_var_free(Answer);
-       xfree(Answer->val.integer);
        return (NULL);
     }
     return Answer;
@@ -835,9 +834,6 @@ snmp_prfProtoFn(variable_list * Var, long *ErrP)
            *(Answer->val.integer) = (long) store_swap_size;
            break;
        default:
-#if 0
-           xfree(Answer->val.integer);
-#endif
            *ErrP = SNMP_ERR_NOSUCHNAME;
            snmp_var_free(Answer);
            return (NULL);
@@ -887,9 +883,6 @@ snmp_prfProtoFn(variable_list * Var, long *ErrP)
            x = statHistDeltaMedian(&l->dns.svc_time, &f->dns.svc_time);
            break;
        default:
-#if 0
-           xfree(Answer->val.integer);
-#endif
            *ErrP = SNMP_ERR_NOSUCHNAME;
            snmp_var_free(Answer);
            return (NULL);

diff --git a/src/squid.h b/src/squid.h
index 58d1058e8e1383dd8aabeb08e32d98fb2b3661d7..02fc5533228e5cada6b20b481f1cd8feb94b2803 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.159 1998/02/22 11:59:59 kostas Exp $
+ * $Id: squid.h,v 1.160 1998/02/26 22:16:31 kostas Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -350,5 +350,4 @@ struct rusage {
 #define calloc +
 #define sprintf +
 #define strdup +
-
 #endif /* SQUID_H */