Retry: Fixes memory leaks in the eventhandler

runtime/platform/hashmap.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/hashmap.h"
 
 #include "platform/utils.h"
 
 namespace dart {
 
 HashMap::HashMap(MatchFun match, uint32_t initial_capacity) {
   match_ = match;
   Initialize(initial_capacity);
 }
 
 
 HashMap::~HashMap() {
-  free(map_);
+  delete[] map_;
 }
 
 
 HashMap::Entry* HashMap::Lookup(void* key, uint32_t hash, bool insert) {
   // Find a matching entry.
   Entry* p = Probe(key, hash);
   if (p->key != NULL) {
     return p;
   }
 
@@ skipping 70 matching lines @@
     // candidate entry for clearing.
     if ((next > candidate && (start <= candidate || start > next)) ||
         (next < candidate && (start <= candidate && start > next))) {
       *candidate = *next;
       candidate = next;
     }
   }
 
   // Clear the candidate which will not break searching the hash table.
   candidate->key = NULL;
+  candidate->value = NULL;
   occupancy_--;
 }
 
 
-void HashMap::Clear() {
+void HashMap::Clear(ClearFun clear) {
   // Mark all entries as empty.
   const Entry* end = map_end();
   for (Entry* p = map_; p < end; p++) {
+    if ((clear != NULL) && (p->key != NULL)) {
+      clear(p->value);
+    }
+    p->value = NULL;
     p->key = NULL;
   }
   occupancy_ = 0;
 }
 
 
 HashMap::Entry* HashMap::Start() const {
   return Next(map_ - 1);
 }
 
@@ skipping 25 matching lines @@
       p = map_;
     }
   }
 
   return p;
 }
 
 
 void HashMap::Initialize(uint32_t capacity) {
   ASSERT(dart::Utils::IsPowerOfTwo(capacity));
-  map_ = reinterpret_cast<Entry*>(malloc(capacity * sizeof(Entry)));
+  map_ = new Entry[capacity];
   if (map_ == NULL) {
     // TODO(sgjesse): Handle out of memory.
     FATAL("Cannot allocate memory for hashmap");
     return;
   }
   capacity_ = capacity;
-  Clear();
+  occupancy_ = 0;
 }
 
 
 void HashMap::Resize() {
   Entry* map = map_;
   uint32_t n = occupancy_;
 
   // Allocate larger map.
   Initialize(capacity_ * 2);
 
   // Rehash all current entries.
   for (Entry* p = map; n > 0; p++) {
     if (p->key != NULL) {
       Lookup(p->key, p->hash, true)->value = p->value;
       n--;
     }
   }
 
   // Delete old map.
-  free(map);
+  delete[] map;
 }
 
 }  // namespace dart