mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r21674] Issue 7618 - the library had seg fault when it tried to shrink the size of compound data type through H5Tset_size immedia

Browse Source 
tely after the type was created.  I fixed it in this commit.

Tested on jam, linew, and koala.
This commit is contained in:
Raymond Lu 2011-10-26 09:25:16 -05:00
parent 9b7016e1d7
commit c61a0a3d62
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release_docs/RELEASE.txt
View File

@ -343,6 +343,9 @@ Bug Fixes since HDF5-1.8.0 release
Library
-------
- The library had seg fault when it tried to shrink the size of compound type
through H5Tset_size immediately after the type was created (Issue
7618). It's fixed now. (SLU - 2011/10/26)
- Fixed a bug that occurred when using H5Ocopy on a committed datatype
containing an attribute using that committed datatype.
(NAF - 2011/10/13 - Issue 5854)

26
src/H5T.c
View File

@ -3712,7 +3712,7 @@ H5T_set_size(H5T_t *dt, size_t size)
case H5T_COMPOUND:
/* If decreasing size, check the last member isn't being cut. */
if(size<dt->shared->size) {
int num_membs;
int num_membs = 0;
unsigned i, max_index=0;
size_t memb_offset, max_offset=0;
size_t max_size;
@ -3720,19 +3720,21 @@ H5T_set_size(H5T_t *dt, size_t size)
if((num_membs = H5T_get_nmembers(dt))<0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to get number of members");
for(i=0; i<(unsigned)num_membs; i++) {
memb_offset = H5T_get_member_offset(dt, i);
if(memb_offset > max_offset) {
max_offset = memb_offset;
max_index = i;
}
if(num_membs) {
for(i=0; i<(unsigned)num_membs; i++) {
memb_offset = H5T_get_member_offset(dt, i);
if(memb_offset > max_offset) {
max_offset = memb_offset;
max_index = i;
}
}
max_size = H5T_get_member_size(dt, max_index);
if(size<(max_offset+max_size))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "size shrinking will cut off last member ");
}
max_size = H5T_get_member_size(dt, max_index);
if(size<(max_offset+max_size))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "size shrinking will cut off last member ");
/* Compound must not have been packed previously */
/* We will check if resizing changed the packed state of
* this type at the end of this function */

14
test/dtypes.c
View File

@ -523,6 +523,12 @@ test_compound_1(void)
if ((complex_id = H5Tcreate(H5T_COMPOUND, sizeof(complex_t))) < 0)
goto error;
/* Try to shrink and expand the size */
if(H5Tset_size(complex_id, sizeof(double)) < 0)
goto error;
if(H5Tset_size(complex_id, sizeof(complex_t)) < 0)
goto error;
/* Attempt to add the new compound datatype as a field within itself */
H5E_BEGIN_TRY {
ret=H5Tinsert(complex_id, "compound", (size_t)0, complex_id);
@ -538,6 +544,14 @@ test_compound_1(void)
goto error;
/* Test some functions that aren't supposed to work for compound type */
/* Tries to shrink the size and trail the last member */
H5E_BEGIN_TRY {
ret=H5Tset_size(complex_id, sizeof(double));
} H5E_END_TRY;
if (ret>=0) {
FAIL_PUTS_ERROR("Operation not allowed for this type.");
} /* end if */
H5E_BEGIN_TRY {
size=H5Tget_precision(complex_id);
} H5E_END_TRY;