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

[svn-r22070] Purpose: Fix rare corruption bug

Browse Source 
Description:
When using the new object header format and adding an attribute with a size near
64K, it was possible for file corruption to occur.  This happened only if the
first object header chunk was smaller than 256 bytes and then grew to larger
than 64K after the attribute was added.

Tested: ostrich, jam, koala (h5committest), durandal
This commit is contained in:
Neil Fortner
2012-03-15 13:42:51 -05:00
parent 9f35a8b04e
commit d849a118c2
3 changed files with 235 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/H5Oalloc.c
View File

@@ -559,26 +559,27 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
/* Check for changing the chunk #0 data size enough to need adjusting the flags */
if(oh->version > H5O_VERSION_1 && chunkno == 0) {
uint64_t chunk0_size; /* Size of chunk 0's data */
size_t orig_prfx_size = (size_t)1 << (oh->flags & H5O_HDR_CHUNK0_SIZE); /* Original prefix size */
HDassert(oh->chunk[0].size >= (size_t)H5O_SIZEOF_HDR(oh));
chunk0_size = oh->chunk[0].size - (size_t)H5O_SIZEOF_HDR(oh);
/* Check for moving from a 1-byte to a 2-byte size encoding */
if(chunk0_size <= 255 && (chunk0_size + delta) > 255) {
extra_prfx_size = 1;
new_size_flags = H5O_HDR_CHUNK0_2;
/* Check for moving to a 8-byte size encoding */
if(orig_prfx_size < 8 && (chunk0_size + delta) > 4294967295) {
extra_prfx_size = 8 - orig_prfx_size;
new_size_flags = H5O_HDR_CHUNK0_8;
adjust_size_flags = TRUE;
} /* end if */
/* Check for moving from a 2-byte to a 4-byte size encoding */
else if(chunk0_size <= 65535 && (chunk0_size + delta) > 65535) {
extra_prfx_size = 2;
/* Check for moving to a 4-byte size encoding */
else if(orig_prfx_size < 4 && (chunk0_size + delta) > 65535) {
extra_prfx_size = 4 - orig_prfx_size;
new_size_flags = H5O_HDR_CHUNK0_4;
adjust_size_flags = TRUE;
} /* end if */
/* Check for moving from a 4-byte to a 8-byte size encoding */
else if(chunk0_size <= 4294967295 && (chunk0_size + delta) > 4294967295) {
extra_prfx_size = 4;
new_size_flags = H5O_HDR_CHUNK0_8;
/* Check for moving to a 2-byte size encoding */
else if(orig_prfx_size < 2 && (chunk0_size + delta) > 255) {
extra_prfx_size = 2 - orig_prfx_size;
new_size_flags = H5O_HDR_CHUNK0_2;
adjust_size_flags = TRUE;
} /* end if */
} /* end if */