summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2020-07-17 19:27:12 (GMT)
committervchoi <vchoi@jelly.ad.hdfgroup.org>2020-07-21 17:57:12 (GMT)
commitccf4a92ec6c552400a1bb15c8d43f68a8592850f (patch)
tree2b8132642d72a7acababbbc164b3acb02b3f6b53 /src
parent0ee5d676210291f784ce273ee34b1a7d383ec694 (diff)
downloadhdf5-ccf4a92ec6c552400a1bb15c8d43f68a8592850f.zip
hdf5-ccf4a92ec6c552400a1bb15c8d43f68a8592850f.tar.gz
hdf5-ccf4a92ec6c552400a1bb15c8d43f68a8592850f.tar.bz2
Merge pull request #2693 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-11080-heap-use-after-free-by-the-call to develop
* commit '3023b34272cc6ada84aebfa7441a6a55afa3621c': Update MANIFEST. Add new test to Cmake. Fix for jira issue HDFFV-11080: (1) Patch up the file pointer when reading attribute of variable length datatype (2) Test to verify the fix when doing multiple threads
Diffstat (limited to 'src')
-rw-r--r--src/H5Aint.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/H5Aint.c b/src/H5Aint.c
index f923e24..d388fb5 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -613,6 +613,10 @@ H5A__read(const H5A_t *attr, const H5T_t *mem_type, 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_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch VL datatype file pointer")
+
/* Create buffer for data to store on disk */
if((snelmts = H5S_GET_EXTENT_NPOINTS(attr->shared->ds)) < 0)
HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "dataspace is invalid")