commit 88b6b051cc1c92b40537941c68061fc0d3b46a9f
author Mathieu Chartier <mathieuc@google.com> Wed Jul 22 19:39:56 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Jul 22 19:41:00 2015 -0700
tree de066adf7754de296329c822d50e8ffb79226d7f
parent 3c9c776017cd628d594fda0943634f2bdcc980b8

Fix hash set memory leaks

There was a memory leak if ShrinkToMaximumLoad caused the set to
become 0 size. Fixes valgrind tests.

Change-Id: Ibdd033768d622443fb34e7a5e5e1c00e082a1a4a

runtime/base/hash_set.h

diff --git a/runtime/base/hash_set.h b/runtime/base/hash_set.h
index 709d9ae..d110fe3 100644
--- a/runtime/base/hash_set.h
+++ b/runtime/base/hash_set.h
@@ -470,31 +470,31 @@
   }
 
   void DeallocateStorage() {
-    if (num_buckets_ != 0) {
-      if (owns_data_) {
-        for (size_t i = 0; i < NumBuckets(); ++i) {
-          allocfn_.destroy(allocfn_.address(data_[i]));
-        }
-        allocfn_.deallocate(data_, NumBuckets());
-        owns_data_ = false;
+    if (owns_data_) {
+      for (size_t i = 0; i < NumBuckets(); ++i) {
+        allocfn_.destroy(allocfn_.address(data_[i]));
       }
-      data_ = nullptr;
-      num_buckets_ = 0;
+      if (data_ != nullptr) {
+        allocfn_.deallocate(data_, NumBuckets());
+      }
+      owns_data_ = false;
     }
+    data_ = nullptr;
+    num_buckets_ = 0;
   }
 
   // Expand the set based on the load factors.
   void Expand() {
     size_t min_index = static_cast<size_t>(Size() / min_load_factor_);
-    if (min_index < kMinBuckets) {
-      min_index = kMinBuckets;
-    }
     // Resize based on the minimum load factor.
     Resize(min_index);
   }
 
   // Expand / shrink the table to the new specified size.
   void Resize(size_t new_size) {
+    if (new_size < kMinBuckets) {
+      new_size = kMinBuckets;
+    }
     DCHECK_GE(new_size, Size());
     T* const old_data = data_;
     size_t old_num_buckets = num_buckets_;