diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-12 14:07:21 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-12 14:07:21 (GMT) |
| commit | e8409e6ff14824143456f51c5d4607775a6e16da (patch) | |
| tree | b1c45d0c8a7ab313afc768ce257ec50f9fe67063 /src/H5HFcache.c | |
| parent | 2f2bca0e937b027118c38ff9e590cf805ecf1774 (diff) | |
| download | hdf5-e8409e6ff14824143456f51c5d4607775a6e16da.zip hdf5-e8409e6ff14824143456f51c5d4607775a6e16da.tar.gz hdf5-e8409e6ff14824143456f51c5d4607775a6e16da.tar.bz2 | |
[svn-r28036] Description:
Bring r27801 & r27809 from trunk to branch
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial
(h5committest not required on this branch)
Diffstat (limited to 'src/H5HFcache.c')
| -rw-r--r-- | src/H5HFcache.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/H5HFcache.c b/src/H5HFcache.c index 7171da9..1ba0c02 100644 --- a/src/H5HFcache.c +++ b/src/H5HFcache.c @@ -2210,7 +2210,7 @@ H5HF__cache_dblock_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *_thing, H5HF_hdr_t *hdr; /* Shared fractal heap information */ H5HF_direct_t *dblock = (H5HF_direct_t *)_thing; /* Direct block info */ H5HF_indirect_t *par_iblock; /* Parent indirect block */ - unsigned par_entry; /* Entry in parent indirect block */ + unsigned par_entry = 0; /* Entry in parent indirect block */ void *write_buf; /* Pointer to buffer to write out */ size_t write_size; /* Size of buffer to write out */ uint8_t *image; /* Pointer into raw data buffer */ @@ -2510,6 +2510,7 @@ H5HF__cache_dblock_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *_thing, else { /* the direct block's parent is an indirect block */ /* Sanity check */ HDassert(par_iblock); + HDassert(par_iblock->ents); HDassert(H5F_addr_eq(par_iblock->ents[par_entry].addr, addr)); /* Allocate 'normal' space for the direct block */ |