diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-09-16 22:39:04 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-09-16 22:39:04 (GMT) |
| commit | 1215cec5018ffec7cbe0a5d9546f280c1315d646 (patch) | |
| tree | c030308c89bfc612e20d852ab224b5491b6a107a | |
| parent | c1c522f6ce8f6d7e44e6ea99860b19228f46952a (diff) | |
| parent | db1022ef5dad4ee450ca092b8b471040f405bbcf (diff) | |
| download | hdf5-1215cec5018ffec7cbe0a5d9546f280c1315d646.zip hdf5-1215cec5018ffec7cbe0a5d9546f280c1315d646.tar.gz hdf5-1215cec5018ffec7cbe0a5d9546f280c1315d646.tar.bz2 | |
Merge pull request #1923 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit 'db1022ef5dad4ee450ca092b8b471040f405bbcf':
Fix segfault after H5VL_loc_params_t fix merge
| -rw-r--r-- | src/H5Gdeprec.c | 4 | ||||
| -rw-r--r-- | src/H5VLpassthru.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 5acb378..97a3ccf 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -357,7 +357,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new tmp_vol_obj.connector = vol_obj->connector; /* Create the link through the VOL */ - if(H5VL_link_create(H5VL_LINK_CREATE_HARD, &tmp_vol_obj, &loc_params2, lcpl_id, H5P_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, vol_obj->data, loc_params1) < 0) + if(H5VL_link_create(H5VL_LINK_CREATE_HARD, &tmp_vol_obj, &loc_params2, lcpl_id, H5P_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, vol_obj->data, &loc_params1) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end if */ else if(type == H5L_TYPE_SOFT) { @@ -437,7 +437,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier") /* Create the link through the VOL */ - if(H5VL_link_create(H5VL_LINK_CREATE_HARD, vol_obj2, &loc_params2, lcpl_id, H5P_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, vol_obj1->data, loc_params1) < 0) + if(H5VL_link_create(H5VL_LINK_CREATE_HARD, vol_obj2, &loc_params2, lcpl_id, H5P_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, vol_obj1->data, &loc_params1) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end if */ else if(type == H5L_TYPE_SOFT) { diff --git a/src/H5VLpassthru.c b/src/H5VLpassthru.c index eecdac2..24070fa 100644 --- a/src/H5VLpassthru.c +++ b/src/H5VLpassthru.c @@ -2131,11 +2131,11 @@ H5VL_pass_through_link_create(H5VL_link_create_type_t create_type, void *obj, /* Fix up the link target object for hard link creation */ if(H5VL_LINK_CREATE_HARD == create_type) { void *cur_obj; - H5VL_loc_params_t cur_params; + H5VL_loc_params_t *cur_params; /* Retrieve the object & loc params for the link target */ cur_obj = va_arg(arguments, void *); - cur_params = va_arg(arguments, H5VL_loc_params_t); + cur_params = va_arg(arguments, H5VL_loc_params_t *); /* If it's a non-NULL pointer, find the 'under object' and re-set the property */ if(cur_obj) { |