Merge r5429 (fix for: memcheck/tests/mempool reads freed memory)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH@5450

diff --git a/coregrind/m_hashtable.c b/coregrind/m_hashtable.c
index 98d041355b773973434a1233aecd6b522563491c..eec3c319c6043718e7ea782e8c2b96af727c9d52 100644 (file)
--- a/coregrind/m_hashtable.c
+++ b/coregrind/m_hashtable.c
@@ -234,11 +234,12 @@ void* VG_(HT_Next)(VgHashTable table)
 
 void VG_(HT_destruct)(VgHashTable table)
 {
-   UInt      i;
-   VgHashNode* node;
+   UInt       i;
+   VgHashNode *node, *node_next;
    
    for (i = 0; i < table->n_chains; i++) {
-      for (node = table->chains[i]; node != NULL; node = node->next) {
+      for (node = table->chains[i]; node != NULL; node = node_next) {
+         node_next = node->next;
          VG_(free)(node);
       }
    }