mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-12-03 02:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with variable length attributes being accessed through multiple file handles (#2181)

Browse Source 
* Fix bug with variable length attributes being accessed through multiple
file handles.

* Committing clang-format changes

Co-authored-by: Neil Fortner <nfortne2@localhost.localdomain>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Neil Fortner 2022-10-25 07:46:15 -05:00 committed by GitHub
parent 93754cae33
commit 7997b53589
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release_docs/RELEASE.txt
View File

@ -125,6 +125,16 @@ Bug Fixes since HDF5-1.13.2 release
===================================
Library
-------
- Fixed an issue with variable length attributes
Previously, if a variable length attribute was held open while its file
was opened through another handle, the same attribute was opened through
the second file handle, and the second file and attribute handles were
closed, attempting to write to the attribute through the first handle
would cause an error.
(NAF - 2022/10/24)
- Fixed an issue with hyperslab selections
Previously, when combining hyperslab selections, it was possible for the

4
src/H5Aint.c
View File

@ -836,6 +836,10 @@ H5A__write(H5A_t *attr, const H5T_t *mem_type, const void *buf)
HDassert(mem_type);
HDassert(buf);
/* Patch the top level file pointer in attr->shared->dt->shared->u.vlen.f if needed */
if (H5T_patch_vlen_file(attr->shared->dt, H5F_VOL_OBJ(attr->oloc.file)) < 0)
HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't patch VL datatype file pointer")
/* Get # of elements for attribute's dataspace */
if ((snelmts = H5S_GET_EXTENT_NPOINTS(attr->shared->ds)) < 0)
HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "dataspace is invalid")

77
test/tattr.c
View File

@ -11109,6 +11109,81 @@ test_attr_bug9(hid_t fcpl, hid_t fapl)
CHECK(ret, FAIL, "H5Sclose");
} /* test_attr_bug9() */
/****************************************************************
**
** test_attr_bug10(): Test basic H5A (attribute) code.
** Attempts to trigger a bug which would result in a
** segfault. Create a vlen attribute through a file
** handle, then open the same file through a different
** handle, open the same attribute through the second file
** handle, then close the second file and attribute
** handles, then write to the attribute through the first
** handle.
**
****************************************************************/
static void
test_attr_bug10(hid_t fcpl, hid_t fapl)
{
hid_t fid1, fid2; /* File IDs */
hid_t aid1, aid2; /* Attribute IDs */
hid_t sid; /* Dataspace ID */
hid_t tid; /* Datatype ID */
hsize_t dims[1] = {1}; /* Attribute dimensions */
const char *wbuf[1] = {"foo"}; /* Write buffer */
herr_t ret; /* Generic return status */
/* Output message about test being performed */
MESSAGE(5, ("Testing that vlen attributes can be written to after a second file handle is closed\n"));
/* Create dataspace */
sid = H5Screate_simple(1, dims, NULL);
CHECK(sid, FAIL, "H5Screate_simple");
/* Create VL string datatype */
tid = H5Tcopy(H5T_C_S1);
CHECK(tid, FAIL, "H5Tcreate");
ret = H5Tset_size(tid, H5T_VARIABLE);
CHECK(ret, FAIL, "H5Tset_size");
/* Create file */
fid1 = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl);
CHECK(fid1, FAIL, "H5Fcreate");
/* Create attribute on root group */
aid1 = H5Acreate2(fid1, "attr", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
CHECK(aid1, FAIL, "H5Acreate2");
/* Open the same file again */
fid2 = H5Fopen(FILENAME, H5F_ACC_RDWR, fapl);
CHECK(fid2, FAIL, "H5Fcreate");
/* Open the same attribute through the second file handle */
aid2 = H5Aopen(fid2, "attr", H5P_DEFAULT);
CHECK(aid2, FAIL, "H5Aopen");
/* Close the second attribute and file handles */
ret = H5Aclose(aid2);
CHECK(ret, FAIL, "H5Aclose");
ret = H5Fclose(fid2);
CHECK(ret, FAIL, "H5Fclose");
/* Write to the attribute through the first handle */
ret = H5Awrite(aid1, tid, wbuf);
/* Close IDs */
ret = H5Aclose(aid1);
CHECK(ret, FAIL, "H5Aclose");
ret = H5Fclose(fid1);
CHECK(ret, FAIL, "H5Fclose");
ret = H5Tclose(tid);
CHECK(ret, FAIL, "H5Tclose");
ret = H5Sclose(sid);
CHECK(ret, FAIL, "H5Sclose");
} /* test_attr_bug10() */
/****************************************************************
**
** test_attr_delete_dense():
@ -11338,6 +11413,8 @@ test_attr(void)
test_attr_bug8(my_fcpl,
my_fapl); /* Test attribute expanding object header with undecoded messages */
test_attr_bug9(my_fcpl, my_fapl); /* Test large attributes converting to dense storage */
test_attr_bug10(my_fcpl, my_fapl); /* Test writing an attribute after opening and closing
through a different file handle */
/* tests specific to the "new format" */
if (new_format == TRUE) {