Fix some memory leaks

[satune.git] / src / Collections / hashtable.h

diff --git a/src/Collections/hashtable.h b/src/Collections/hashtable.h
index 44b984daafea43a9b9ab943ea23d04dc025ea531..218fb2d6d17f653004baaeecdef7cf59dee549b1 100644 (file)
--- a/src/Collections/hashtable.h
+++ b/src/Collections/hashtable.h
@@ -126,7 +126,25 @@ public:
                }
        }
 
-       void resetanddelete() {
+       void resetAndDeleteKeys() {
+               for (unsigned int i = 0; i < capacity; i++) {
+                       struct Hashlistnode<_Key, _Val> *bin = &table[i];
+                       if (bin->key != NULL) {
+                               delete bin->key;
+                               bin->key = NULL;
+                               if (bin->val != NULL) {
+                                       bin->val = NULL;
+                               }
+                       }
+               }
+               if (zero) {
+                       ourfree(zero);
+                       zero = NULL;
+               }
+               size = 0;
+       }
+
+       void resetAndDeleteVals() {
                for (unsigned int i = 0; i < capacity; i++) {
                        struct Hashlistnode<_Key, _Val> *bin = &table[i];
                        if (bin->key != NULL) {
@@ -146,7 +164,7 @@ public:
                size = 0;
        }
 
-       void resetandfree() {
+       void resetAndFreeVals() {
                for (unsigned int i = 0; i < capacity; i++) {
                        struct Hashlistnode<_Key, _Val> *bin = &table[i];
                        if (bin->key != NULL) {