Skip to content

Commit

Permalink
Fix incorrect error check in H5Ofill.c for undefined fill values (#3312)
Browse files Browse the repository at this point in the history
  • Loading branch information
jhendersonHDF authored Aug 2, 2023
1 parent b1e07c7 commit a78863a
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 4 deletions.
8 changes: 8 additions & 0 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,14 @@ Bug Fixes since HDF5-1.14.0 release
===================================
Library
-------
- Fixed an issue where an assert statement was converted to an
incorrect error check statement

An assert statement in the library dealing with undefined dataset data
fill values was converted to an improper error check that would always
trigger when a dataset's fill value was set to NULL (undefined). This
has now been fixed.

- Fixed an assertion failure when attempting to use the Subfiling IOC
VFD directly

Expand Down
2 changes: 1 addition & 1 deletion src/H5Ofill.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ H5O__fill_new_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
/* Check for undefined fill value */
if (flags & H5O_FILL_FLAG_UNDEFINED_VALUE) {

if (flags & (unsigned)~H5O_FILL_FLAG_HAVE_VALUE)
if (flags & H5O_FILL_FLAG_HAVE_VALUE)
HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "have value and undefined value flags both set")

/* Set value for "undefined" fill value */
Expand Down
35 changes: 32 additions & 3 deletions test/fillval.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,9 +387,12 @@ test_getset_vl(hid_t fapl)
static int
test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
{
hid_t file = -1, space = -1, dcpl = -1, comp_type_id = -1;
hid_t dset1 = -1, dset2 = -1, dset3 = -1, dset4 = -1, dset5 = -1, dset6 = -1, /* dset7=-1, */ dset8 = -1,
dset9 = -1;
hid_t file = H5I_INVALID_HID, space = H5I_INVALID_HID, dcpl = H5I_INVALID_HID,
comp_type_id = H5I_INVALID_HID;
hid_t dset1 = H5I_INVALID_HID, dset2 = H5I_INVALID_HID, dset3 = H5I_INVALID_HID, dset4 = H5I_INVALID_HID,
dset5 = H5I_INVALID_HID, dset6 = H5I_INVALID_HID,
/* dset7=H5I_INVALID_HID, */ dset8 = H5I_INVALID_HID, dset9 = H5I_INVALID_HID,
dset10 = H5I_INVALID_HID;
hsize_t cur_size[5] = {2, 8, 8, 4, 2};
hsize_t ch_size[5] = {1, 1, 1, 4, 1};
short rd_s, fill_s = 0x1234;
Expand Down Expand Up @@ -550,6 +553,20 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
}
H5E_END_TRY

/*
* Test that a dataset with an undefined fill value can be
* created and then re-opened after the file it is in has
* been closed and re-opened. This is to test for a bug that
* was introduced in the fill value object header message
* decoding logic.
*/
if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0)
goto error;
if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, NULL) < 0)
goto error;
if ((dset10 = H5Dcreate2(file, "dset10", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
goto error;

/* Close everything */
if (H5D_COMPACT != layout) {
if (H5Dclose(dset1) < 0)
Expand All @@ -569,6 +586,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
goto error;
if (H5Dclose(dset8) < 0)
goto error;
if (H5Dclose(dset10) < 0)
goto error;
if (H5Sclose(space) < 0)
goto error;
if (H5Pclose(dcpl) < 0)
Expand Down Expand Up @@ -801,6 +820,15 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
if (H5Pclose(dcpl) < 0)
goto error;

/*
* Check that the dataset with an undefined fill value can
* be opened.
*/
if ((dset10 = H5Dopen2(file, "dset10", H5P_DEFAULT)) < 0)
goto error;
if (H5Dclose(dset10) < 0)
goto error;

if (H5Fclose(file) < 0)
goto error;

Expand All @@ -822,6 +850,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
H5Dclose(dset5);
H5Dclose(dset6);
H5Dclose(dset8);
H5Dclose(dset10);
H5Fclose(file);
}
H5E_END_TRY
Expand Down

0 comments on commit a78863a

Please sign in to comment.