diff options
| author | hdftest <hdftest@hdfgroup.org> | 2018-06-24 22:37:20 (GMT) |
|---|---|---|
| committer | hdftest <hdftest@hdfgroup.org> | 2018-06-24 22:37:20 (GMT) |
| commit | e9f476dad47ce593f13dacb77b1cc664d1f24e7b (patch) | |
| tree | c775d3e8a991a37373c0ec640d7a8c2e6b883b3c /src/H5Olayout.c | |
| parent | 2ff00b1b937ebe36ac6ddf590c16a4c27fc0b053 (diff) | |
| parent | 25f80cbbec3a7d8036325784168b029cb71cc813 (diff) | |
| download | hdf5-e9f476dad47ce593f13dacb77b1cc664d1f24e7b.zip hdf5-e9f476dad47ce593f13dacb77b1cc664d1f24e7b.tar.gz hdf5-e9f476dad47ce593f13dacb77b1cc664d1f24e7b.tar.bz2 | |
Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop
* commit '25f80cbbec3a7d8036325784168b029cb71cc813': (324 commits)
Snapshot version 1.10 release 3 (snap3)
Update document
HDFFV-10433 Updated text to address issues raised.
Snapshot version 1.10 release 3 (snap2)
Updated version to 1.10.3-snap2
Merge corrections from develop
HDFFV-10473 add note for attribute fix
Correct attribute location
HDFFV-9739 and cmake improvements merge from develop
Fix for HDFFV-10469: set to latest format for virtual layout encoding.
Update Windows test machines
Fix soversion
Fixed libver bounds underscore issue
removed extraneous lib. ver. bound, PR comment
temporary fix for HDFFV-10469
Updated version to 1.10.3-snap1
Add new file
Correct number of tests
Whitespace and test reclassify merge from develop
HDFFV-10444 fix so numbers and merge java test changes
...
Diffstat (limited to 'src/H5Olayout.c')
| -rw-r--r-- | src/H5Olayout.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index d8f05f0..afaddfa 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -548,8 +548,10 @@ done: static herr_t H5O__layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg) { - const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; - unsigned u; + const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; + uint8_t *heap_block = NULL; + size_t *str_size = NULL; + unsigned u; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -685,6 +687,10 @@ H5O__layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, } /* end switch */ done: + + heap_block = (uint8_t *)H5MM_xfree(heap_block); + str_size = (size_t *)H5MM_xfree(str_size); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5O__layout_encode() */ |