diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-07-16 23:43:29 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-07-16 23:43:29 (GMT) |
| commit | 1e612c3a46880773d53ad315f3aef2104abb9347 (patch) | |
| tree | 1259838b4fe2f3bb8ca78c8f0b4dea00557c89d1 /src/H5Pdcpl.c | |
| parent | 5e94d0336fa7a0ebc0a25d002b413221284691b6 (diff) | |
| parent | 75f4e51a1a076ea2f1602619e2a7d7bcce13c2f1 (diff) | |
| download | hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.zip hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.tar.gz hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.tar.bz2 | |
[svn-r22584] merge from trunk and resolve type ID registration
Diffstat (limited to 'src/H5Pdcpl.c')
| -rw-r--r-- | src/H5Pdcpl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 1a5a220..a6ff3a3 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -1581,8 +1581,8 @@ H5P_get_fill_value(H5P_genplist_t *plist, const H5T_t *type, void *value/*out*/, else { if(NULL == (buf = H5MM_malloc(H5T_get_size(fill.type)))) HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "memory allocation failed for type conversion") - if(H5T_path_bkg(tpath)) - bkg = value; + if(H5T_path_bkg(tpath) && NULL == (bkg = H5MM_malloc(H5T_get_size(fill.type)))) + HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "memory allocation failed for type conversion") } /* end else */ HDmemcpy(buf, fill.buf, H5T_get_size(fill.type)); |