diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-01-03 01:16:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-01-03 01:16:35 (GMT) |
| commit | f56120fdc30ea5a10d6c2b3e42d272d800fc8231 (patch) | |
| tree | 43b73551781d7f21fa31e0fae57d802cb79ad70b | |
| parent | b9ba373c8ce8123d70878739c160892c63e5627e (diff) | |
| download | hdf5-f56120fdc30ea5a10d6c2b3e42d272d800fc8231.zip hdf5-f56120fdc30ea5a10d6c2b3e42d272d800fc8231.tar.gz hdf5-f56120fdc30ea5a10d6c2b3e42d272d800fc8231.tar.bz2 | |
[svn-r28770] Description:
Bring r28769 from trunk to revise_chunks branch:
More memory cleanups and leak elimination.
Tested on:
MacOSX/64 10.11.2 (amazon) w/serial & parallel
(h5committest not required on this branch)
| -rw-r--r-- | src/H5Dcompact.c | 1 | ||||
| -rw-r--r-- | src/H5Eint.c | 5 | ||||
| -rw-r--r-- | tools/h5repack/h5repacktst.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index e2dc36f..df2a740 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -440,6 +440,7 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *storage_src, H5F_t *f_dst HDassert(storage_src); HDassert(f_dst); HDassert(storage_dst); + HDassert(storage_dst->buf); HDassert(dt_src); /* Create datatype ID for src datatype, so it gets freed */ diff --git a/src/H5Eint.c b/src/H5Eint.c index 6e84a09..6ed405f 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -743,8 +743,13 @@ H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned lin done: if(va_started) va_end(ap); +#ifdef H5_HAVE_VASPRINTF + if(tmp) + HDfree(tmp); +#else /* H5_HAVE_VASPRINTF */ if(tmp) H5MM_xfree(tmp); +#endif /* H5_HAVE_VASPRINTF */ FUNC_LEAVE_NOAPI(ret_value) } /* end H5E_printf_stack() */ diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c index 030b052..07ea676 100644 --- a/tools/h5repack/h5repacktst.c +++ b/tools/h5repack/h5repacktst.c @@ -1603,6 +1603,8 @@ int main (void) puts("All h5repack tests passed."); + h5tools_close(); + return 0; error: |