diff options
| -rw-r--r-- | release_docs/RELEASE.txt | 2 | ||||
| -rw-r--r-- | tools/lib/h5diff.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 6b1e0e7..98c1f34 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -506,6 +506,8 @@ Bug Fixes since HDF5-1.8.0 release Tools ----- + - Fixed memory leak for h5diff when accessing symbolic links with + --follow-symlink option. Bug#2214 (JKM 2011/3/18) - Fixed memory leak for h5diff when access variable length string data. Bug#2216 (JKM 2011/3/18) - Fixed and improved help page for -a option of h5ls. diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 5f406cf..a616dba 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -1958,9 +1958,6 @@ hsize_t diff(hid_t file1_id, if(options->m_verbose) print_found(nfound); - /* free link info buffer */ - HDfree(linkinfo1.trg_path); - HDfree(linkinfo2.trg_path); } break; @@ -2007,10 +2004,6 @@ hsize_t diff(hid_t file1_id, file2_id, path2, options, linkinfo1.trg_type); } - - /* free link info buffer */ - HDfree(linkinfo1.trg_path); - HDfree(linkinfo2.trg_path); } /* end if */ else { @@ -2045,6 +2038,12 @@ hsize_t diff(hid_t file1_id, break; } + /* free link info buffer */ + if (linkinfo1.trg_path) + HDfree(linkinfo1.trg_path); + if (linkinfo2.trg_path) + HDfree(linkinfo2.trg_path); + return nfound; out: |