summaryrefslogtreecommitdiffstats
path: root/src/H5Dint.c
diff options
context:
space:
mode:
authorvchoi <vchoi@jelly.ad.hdfgroup.org>2020-04-08 03:36:14 (GMT)
committervchoi <vchoi@jelly.ad.hdfgroup.org>2020-04-08 03:36:14 (GMT)
commita1e2133ec01368e4d8b8aed1568b7018d4dcb565 (patch)
tree682005b97166424e3147f1897efd82cb07674bc1 /src/H5Dint.c
parent9da5bbcc9bae79f91788e72bace53ed2323e887f (diff)
downloadhdf5-a1e2133ec01368e4d8b8aed1568b7018d4dcb565.zip
hdf5-a1e2133ec01368e4d8b8aed1568b7018d4dcb565.tar.gz
hdf5-a1e2133ec01368e4d8b8aed1568b7018d4dcb565.tar.bz2
A fix in the cleaning up code for datatype when datatype initialization via H5D__init_type() fails.
The code to fix the problem is the same as what is done in H5D__open_oid().
Diffstat (limited to 'src/H5Dint.c')
-rw-r--r--src/H5Dint.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c
index b3c2d29..730a71f 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -1185,7 +1185,7 @@ H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
ret_value = new_dset;
done:
- if(!ret_value && new_dset && new_dset->shared) {
+ if(!ret_value && new_dset) {
if(new_dset->shared) {
if(new_dset->shared->layout.type == H5D_CHUNKED && layout_init) {
if(H5D__chunk_dest(file, dxpl_id, new_dset) < 0)
@@ -1193,8 +1193,16 @@ done:
} /* end if */
if(new_dset->shared->space && H5S_close(new_dset->shared->space) < 0)
HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release dataspace")
- if(new_dset->shared->type && H5I_dec_ref(new_dset->shared->type_id) < 0)
- HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release datatype")
+ if(new_dset->shared->type) {
+ if(new_dset->shared->type_id > 0) {
+ if(H5I_dec_ref(new_dset->shared->type_id) < 0)
+ HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release datatype")
+ } /* end if */
+ else {
+ if(H5T_close(new_dset->shared->type) < 0)
+ HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release datatype")
+ } /* end else */
+ } /* end if */
if(H5F_addr_defined(new_dset->oloc.addr)) {
if(H5O_dec_rc_by_loc(&(new_dset->oloc), dxpl_id) < 0)
HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, NULL, "unable to decrement refcount on newly created object")