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

Merge branch 'develop' into dset_ohdr_minimize

Browse Source
This commit is contained in:
Jacob Smith 2018-12-13 10:27:27 -06:00
commit 943b7f9c02
3 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/src/hdf/hdf5lib/H5.java
View File

@ -1175,7 +1175,6 @@ public class H5 implements java.io.Serializable {
public synchronized static native int H5Aread_reg_ref(long attr_id, long mem_type_id, String[] buf)
throws HDF5LibraryException, NullPointerException;
throws HDF5LibraryException, NullPointerException;
public synchronized static native int H5Aread_short(long attr_id, long mem_type_id, short[] buf, boolean isCriticalPinning)
throws HDF5LibraryException, NullPointerException;

2
src/H5A.c
View File

@ -1046,6 +1046,8 @@ H5Aget_info(hid_t attr_id, H5A_info_t *ainfo)
/* Check arguments */
if(NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(attr_id, H5I_ATTR)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute")
if(!ainfo)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "attribute_info parameter cannot be NULL")
loc_params.type = H5VL_OBJECT_BY_SELF;
loc_params.obj_type = H5I_get_type(attr_id);

64
test/tattr.c
View File

@ -143,6 +143,10 @@ float attr_data5=-5.123F; /* Test data for 5th attribute */
#define DIM1 100
#define RANK 2
/* Used by test_attr_info_null_info_pointer() */
#define GET_INFO_NULL_POINTER_ATTR_NAME "NullInfoPointerAttr"
/* Attribute iteration struct */
typedef struct {
H5_iter_order_t order; /* Direction of iteration */
@ -5986,6 +5990,65 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
CHECK(ret, FAIL, "H5Sclose");
} /* test_attr_info_by_idx() */
/***************************************************************
**
** test_attr_info_null_info_pointer(): A test to ensure that
** passing a NULL attribute info pointer to H5Aget_info
** (_by_name/_by_idx) doesn't cause bad behavior.
**
****************************************************************/
static void
test_attr_info_null_info_pointer(hid_t fcpl, hid_t fapl)
{
herr_t err_ret = -1;
hid_t fid;
hid_t attr;
hid_t sid;
/* Create dataspace for dataset & attributes */
sid = H5Screate(H5S_SCALAR);
CHECK(sid, FAIL, "H5Screate");
/* Create file */
fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl);
CHECK(fid, FAIL, "H5Fcreate");
/* Create attribute */
attr = H5Acreate2(fid, GET_INFO_NULL_POINTER_ATTR_NAME, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT);
CHECK(attr, FAIL, "H5Acreate2");
H5E_BEGIN_TRY {
err_ret = H5Aget_info(attr, NULL);
} H5E_END_TRY;
CHECK(err_ret, SUCCEED, "H5Aget_info");
H5E_BEGIN_TRY {
err_ret = H5Aget_info_by_name(fid, ".", GET_INFO_NULL_POINTER_ATTR_NAME, NULL, H5P_DEFAULT);
} H5E_END_TRY;
CHECK(err_ret, SUCCEED, "H5Aget_info_by_name");
H5E_BEGIN_TRY {
err_ret = H5Aget_info_by_idx(fid, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, H5P_DEFAULT);
} H5E_END_TRY;
CHECK(err_ret, SUCCEED, "H5Aget_info_by_idx");
/* Close dataspace */
err_ret = H5Sclose(sid);
CHECK(err_ret, FAIL, "H5Sclose");
/* Close attribute */
err_ret = H5Aclose(attr);
CHECK(err_ret, FAIL, "H5Aclose");
/* Close file */
err_ret = H5Fclose(fid);
CHECK(err_ret, FAIL, "H5Fclose");
}
/****************************************************************
**
@ -11024,6 +11087,7 @@ test_attr(void)
test_attr_null_space(my_fcpl, my_fapl); /* Test storing attribute with NULL dataspace */
test_attr_deprec(fcpl, my_fapl); /* Test deprecated API routines */
test_attr_many(new_format, my_fcpl, my_fapl); /* Test storing lots of attributes */
test_attr_info_null_info_pointer(my_fcpl, my_fapl); /* Test passing a NULL attribute info pointer to H5Aget_info(_by_name/_by_idx) */
/* New attribute API routine tests
*/