Merge 87911

Source/WebCore/platform/leveldb/LevelDBTransaction.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 35 matching lines @@
     , m_finished(false)
 {
     m_tree.abstractor().m_comparator = m_comparator;
 }
 
 void LevelDBTransaction::clearTree()
 {
     TreeType::Iterator iterator;
     iterator.start_iter_least(m_tree);
 
+    Vector<AVLTreeNode*> nodes;
+
     while (*iterator) {
-        delete *iterator;
+        nodes.append(*iterator);
         ++iterator;
     }
     m_tree.purge();
+
+    for (size_t i = 0; i < nodes.size(); ++i)
+        delete(nodes[i]);
 }
 
 LevelDBTransaction::~LevelDBTransaction()
 {
     clearTree();
 }
 
 static void initVector(const LevelDBSlice& slice, Vector<char>* vector)
 {
     vector->clear();
@@ skipping 395 matching lines @@
     for (HashSet<TransactionIterator*>::iterator i = m_iterators.begin(); i != m_iterators.end(); ++i) {
         TransactionIterator* transactionIterator = *i;
         transactionIterator->treeChanged();
     }
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(LEVELDB)
 #endif // ENABLE(INDEXED_DATABASE)