diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2019-12-06 22:39:53 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2019-12-06 22:39:53 (GMT) |
| commit | 62e6349eabb00c69fa69aab0fbe34cdc092d072f (patch) | |
| tree | ebf3d32fd91669efe2861fb8d75116b3a1fc57ec /src | |
| parent | 347f5795bf36bc1348b81118f5e33ec1928891c5 (diff) | |
| parent | 47f6c293a78aaa92c80b327795b1f1a242ea30a5 (diff) | |
| download | hdf5-62e6349eabb00c69fa69aab0fbe34cdc092d072f.zip hdf5-62e6349eabb00c69fa69aab0fbe34cdc092d072f.tar.gz hdf5-62e6349eabb00c69fa69aab0fbe34cdc092d072f.tar.bz2 | |
Merge pull request #2101 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:tmp_112_5 to hdf5_1_12
* commit '47f6c293a78aaa92c80b327795b1f1a242ea30a5':
Fix issues with using H5Pget_fill_value() with file datatypes retrieved from H5VLget_file_type().
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Pdcpl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index ddb070a..739865f 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -3324,19 +3324,19 @@ H5P_get_fill_value(H5P_genplist_t *plist, const H5T_t *type, void *value/*out*/) */ if(H5T_get_size(type) >= H5T_get_size(fill.type)) { buf = value; - if(H5T_path_bkg(tpath) && NULL == (bkg = H5MM_malloc(H5T_get_size(type)))) + if(H5T_path_bkg(tpath) && NULL == (bkg = H5MM_calloc(H5T_get_size(type)))) HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "memory allocation failed for type conversion") } /* end if */ else { - if(NULL == (buf = H5MM_malloc(H5T_get_size(fill.type)))) + if(NULL == (buf = H5MM_calloc(H5T_get_size(fill.type)))) HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "memory allocation failed for type conversion") - if(H5T_path_bkg(tpath) && NULL == (bkg = H5MM_malloc(H5T_get_size(fill.type)))) + if(H5T_path_bkg(tpath) && NULL == (bkg = H5MM_calloc(H5T_get_size(fill.type)))) HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "memory allocation failed for type conversion") } /* end else */ H5MM_memcpy(buf, fill.buf, H5T_get_size(fill.type)); /* Do the conversion */ - if((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(type, H5T_COPY_TRANSIENT), FALSE)) < 0) + if((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(type, H5T_COPY_ALL), FALSE)) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "unable to copy/register datatype") if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, buf, bkg) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "datatype conversion failed") |