diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2015-04-02 19:01:03 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2015-04-02 19:01:03 (GMT) |
| commit | be81aef60fc799b47aec3258d5d6caea8ee510ad (patch) | |
| tree | 812cca77f20e12d0c0167855f6e0040313ded390 /src/H5Osdspace.c | |
| parent | 27d820b8ced76eab5ca70304df51a0965c139e5b (diff) | |
| download | hdf5-be81aef60fc799b47aec3258d5d6caea8ee510ad.zip hdf5-be81aef60fc799b47aec3258d5d6caea8ee510ad.tar.gz hdf5-be81aef60fc799b47aec3258d5d6caea8ee510ad.tar.bz2 | |
[svn-r26708] Port r26301 from trunk to 1.8 branch.
Tested: jam, koala, ostrich (h5committest)
Log from r26633:
Description:
Bring Neil's fix for error in H5S_extent_copy() back to the trunk.
Tested on:
Mac OSX/64 10.10.2 (amazon) w/serial
(h5committest forthcoming)
Diffstat (limited to 'src/H5Osdspace.c')
| -rw-r--r-- | src/H5Osdspace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 9ca8436..875cd56 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -308,7 +308,7 @@ H5O_sdspace_copy(const void *_mesg, void *_dest) /* check args */ HDassert(mesg); - if(!dest && NULL == (dest = H5FL_MALLOC(H5S_extent_t))) + if(!dest && NULL == (dest = H5FL_CALLOC(H5S_extent_t))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Copy extent information */ @@ -463,7 +463,7 @@ H5O_sdspace_pre_copy_file(H5F_t UNUSED *file_src, const void *mesg_src, */ if(udata) { /* Allocate copy of dataspace extent */ - if(NULL == (udata->src_space_extent = H5FL_MALLOC(H5S_extent_t))) + if(NULL == (udata->src_space_extent = H5FL_CALLOC(H5S_extent_t))) HGOTO_ERROR(H5E_DATASPACE, H5E_NOSPACE, FAIL, "dataspace extent allocation failed") /* Create a copy of the dataspace extent */ |