philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check whether or not the shadow entry size is different from the

Browse Source 
pagebuffer entry size.  If the sizes are different, then release the old
shadow space (using the correct size) and set the shadow page number to
0 so that H5F_update_vfd_swmr_metadata_file() will allocate new shadow
space with the right size.

Vailin says that this fixes the bug she found, where a 4096-byte buffer
allocated by H5MV_alloc() is released with H5MV_free() as if it was 8192
bytes long.
This commit is contained in:
David Young
2020-04-13 12:10:02 -05:00
parent 8ec3ad3d93
commit 1ce8ff1fea
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/H5PB.c
View File

@@ -1745,14 +1745,27 @@ H5PB_vfd_swmr__update_index(H5F_t *f,
ie_ptr->delayed_flush = entry->delay_write_until;
ie_ptr->moved_to_lower_file = false;
ie_ptr->garbage = false;
ie_ptr->length = (uint32_t)entry->size;
} else {
/* If entry->size changed, discard the too-small (too-big?)
* shadow region and set the shadow-file page number to 0
* so that H5F_update_vfd_swmr_metadata_file() will
* allocate a new one.
*/
if (ie_ptr->length != (uint32_t)entry->size) {
int ret;
ret = shadow_image_defer_free(shared, ie_ptr);
HDassert(ret == 0);
ie_ptr->md_file_page_offset = 0;
ie_ptr->length = (uint32_t)entry->size;
}
idx_ent_modified++;
}
/* entry->size could have changed */
ie_ptr->length = (uint32_t)entry->size;
ie_ptr->entry_ptr = entry->image_ptr;
ie_ptr->tick_of_last_change = tick_num;
assert(entry->is_dirty);