summaryrefslogtreecommitdiffstats
path: root/src/H5FDmulti.c
diff options
context:
space:
mode:
authorJacob Smith <jake.smith@hdfgroup.org>2018-12-19 21:14:51 (GMT)
committerJacob Smith <jake.smith@hdfgroup.org>2018-12-19 21:14:51 (GMT)
commit38de07aea3c824e1fc332e7c03c20e1d0711ecb1 (patch)
treeb1e48c62b7df02238c4e281f6a0599fed10fca15 /src/H5FDmulti.c
parent2b4e540fadf6afab13960ae754f4ece5ad4c976a (diff)
parent33345b835c1cbe96a41c7395ed76af23ea5673d3 (diff)
downloadhdf5-38de07aea3c824e1fc332e7c03c20e1d0711ecb1.zip
hdf5-38de07aea3c824e1fc332e7c03c20e1d0711ecb1.tar.gz
hdf5-38de07aea3c824e1fc332e7c03c20e1d0711ecb1.tar.bz2
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into dset_ohdr_minimize
Diffstat (limited to 'src/H5FDmulti.c')
-rw-r--r--src/H5FDmulti.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index aa1b118..e8dde50 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -497,6 +497,7 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
* Initialize driver specific information. No need to copy it into the FA
* struct since all members will be copied by H5Pset_driver().
*/
+ memset(&fa, 0, sizeof(H5FD_multi_fapl_t));
memcpy(fa.memb_map, memb_map, H5FD_MEM_NTYPES*sizeof(H5FD_mem_t));
memcpy(fa.memb_fapl, memb_fapl, H5FD_MEM_NTYPES*sizeof(hid_t));
memcpy(fa.memb_name, memb_name, H5FD_MEM_NTYPES*sizeof(char*));
@@ -892,7 +893,7 @@ static void *
H5FD_multi_fapl_copy(const void *_old_fa)
{
const H5FD_multi_fapl_t *old_fa = (const H5FD_multi_fapl_t*)_old_fa;
- H5FD_multi_fapl_t *new_fa = (H5FD_multi_fapl_t *)malloc(sizeof(H5FD_multi_fapl_t));
+ H5FD_multi_fapl_t *new_fa = (H5FD_multi_fapl_t *)calloc(1, sizeof(H5FD_multi_fapl_t));
int nerrors = 0;
static const char *func="H5FD_multi_fapl_copy"; /* Function Name for error reporting */