diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-03-22 14:26:12 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-03-22 14:26:12 (GMT) |
| commit | 58ca19929fd614eddee99f0cdc95551d451b4a6a (patch) | |
| tree | e76e89e4f363867f12b0002c0ceb8b659138a909 /tools/h5ls/h5ls.c | |
| parent | 4674cfe1302c2ed84081c229204e923cc16ac9f8 (diff) | |
| download | hdf5-58ca19929fd614eddee99f0cdc95551d451b4a6a.zip hdf5-58ca19929fd614eddee99f0cdc95551d451b4a6a.tar.gz hdf5-58ca19929fd614eddee99f0cdc95551d451b4a6a.tar.bz2 | |
[svn-r20288] Purpose:
Fixed Bug 2216 - GMQS: h5diff - memory leak when compares vlen string in
dataset or attributes
Description:
Merged from HDF5 trunk r20266, r20270 and r20285.
Test for dataset : valgrind --leak-check=full ./h5diff -v h5diff_dset1.h5 h5diff_dset2.h5 /g1/VLstring
Test for attr : valgrind --leak-check=full ./h5diff h5diff_attr1.h5 h5diff_attr2.h5
Both test cases are in testing script.
Tested:
jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), Cmake - jam
Diffstat (limited to 'tools/h5ls/h5ls.c')
| -rw-r--r-- | tools/h5ls/h5ls.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index d288f4b..8987d03 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -1457,10 +1457,8 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, unsigned int vl_data = 0; /* contains VL datatypes */ /* Check if we have VL data in the dataset's datatype */ - if (h5tools_detect_vlen_str(p_type) == TRUE) + if (h5tools_detect_vlen(p_type) == TRUE) vl_data = TRUE; - if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE) - vl_data = TRUE; temp_need= nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type)); assert(temp_need == (hsize_t)((size_t)temp_need)); |