From 52ac99827b3bfa89f4fcf3539d58debeaa73bd36 Mon Sep 17 00:00:00 2001 From: Vailin Choi Date: Fri, 3 Jun 2016 21:52:35 -0500 Subject: [svn-r30009] Fix for h5format_convert daily test failures when --enable-using-memchecker. Tested on jam, ostrich, moohan, osx1010test, quail, kite, mayll. --- src/H5C.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/H5C.c b/src/H5C.c index b7c5919..369758c 100644 --- a/src/H5C.c +++ b/src/H5C.c @@ -9558,6 +9558,8 @@ H5C_expunge_tag_type_metadata(H5F_t *f, hid_t dxpl_id, haddr_t tag, int type_id, entry_ptr = cache_ptr->index[u]; while(entry_ptr != NULL) { + H5C_cache_entry_t *next_entry_ptr = entry_ptr->ht_next; + /* Found one with the same tag and type id */ if(entry_ptr->tag == tag && entry_ptr->type->id == type_id) { @@ -9565,7 +9567,7 @@ H5C_expunge_tag_type_metadata(H5F_t *f, hid_t dxpl_id, haddr_t tag, int type_id, HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "H5C_expunge_entry() failed.") } /* end if */ - entry_ptr = entry_ptr->ht_next; + entry_ptr = next_entry_ptr; } /* end while */ } /* end for */ -- cgit v0.12