diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-06-14 19:23:06 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-06-14 19:23:06 (GMT) |
| commit | bb9370d777b645b9f0e2f5090421b63e207aa50f (patch) | |
| tree | 932aa5b7867b332c854faed4e308abf4e265a5cf /src/H5Oattr.c | |
| parent | d5a8b2a80cd1e5aaa62a523e03a5936260a56f60 (diff) | |
| parent | 57d5c207d94bf876c934094cc7193858590a2c9f (diff) | |
| download | hdf5-bb9370d777b645b9f0e2f5090421b63e207aa50f.zip hdf5-bb9370d777b645b9f0e2f5090421b63e207aa50f.tar.gz hdf5-bb9370d777b645b9f0e2f5090421b63e207aa50f.tar.bz2 | |
Merge branch 'develop' into vol_dev_headers
Also moved the wrapper functions from the H5VLconnector.h to
H5VLconnector_passthru.h
Diffstat (limited to 'src/H5Oattr.c')
| -rw-r--r-- | src/H5Oattr.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/H5Oattr.c b/src/H5Oattr.c index 0a7c4bf..f685a00c 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -200,7 +200,7 @@ H5O_attr_decode(H5F_t *f, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, * What's actually shared, though, is only the extent. */ if(NULL == (attr->shared->ds = H5FL_CALLOC(H5S_t))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Decode attribute's dataspace extent */ if((extent = (H5S_extent_t *)(H5O_MSG_SDSPACE->decode)(f, open_oh, @@ -253,15 +253,11 @@ H5O_attr_decode(H5F_t *f, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, done: if(NULL == ret_value) if(attr) { - if(attr->shared) { - /* Free any dynamically allocated items */ - if(H5A__free(attr) < 0) + /* Free any dynamically allocated items */ + if(attr->shared) + if(H5A__shared_free(attr) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, NULL, "can't release attribute info") - /* Destroy shared attribute struct */ - attr->shared = H5FL_FREE(H5A_shared_t, attr->shared); - } /* end if */ - attr = H5FL_FREE(H5A_t, attr); } /* end if */ |