diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-08-29 12:45:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-29 12:45:44 (GMT) |
| commit | 6129233f4e5c892623e0533b13de3b987af436ea (patch) | |
| tree | 1e07eece3afbe221419fd97f3d75c7c70973b1a2 /tools | |
| parent | bfe867c4cb7b636da21ff4245a2c1da6d96f1955 (diff) | |
| download | hdf5-6129233f4e5c892623e0533b13de3b987af436ea.zip hdf5-6129233f4e5c892623e0533b13de3b987af436ea.tar.gz hdf5-6129233f4e5c892623e0533b13de3b987af436ea.tar.bz2 | |
10 CVE fixes (#3440)
* Fix for CVE-2018-15671
* Fix CVE-2016-4332
* Fix CVE-2018-11202
* Fix CVE-2018-11205
* Fix CVE-2018-13866
* Fix CVE-2018-13867 and CVE-2018-13871
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/src/h5dump/h5dump_ddl.c | 9 | ||||
| -rw-r--r-- | tools/testfiles/tgroup-2.ddl | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c index 96372a1..4066e6c 100644 --- a/tools/src/h5dump/h5dump_ddl.c +++ b/tools/src/h5dump/h5dump_ddl.c @@ -846,10 +846,7 @@ dump_group(hid_t gid, const char *name) H5Oget_info2(gid, &oinfo, H5O_INFO_BASIC); - /* Must check for uniqueness of all objects if we've traversed an elink, - * otherwise only check if the reference count > 1. - */ - if (oinfo.rc > 1 || hit_elink) { + { obj_t *found_obj; /* Found object */ found_obj = search_obj(group_table, oinfo.addr); @@ -873,10 +870,6 @@ dump_group(hid_t gid, const char *name) link_iteration(gid, crt_order_flags); } } - else { - attr_iteration(gid, attr_crt_order_flags); - link_iteration(gid, crt_order_flags); - } dump_indent -= COL; ctx.indent_level--; diff --git a/tools/testfiles/tgroup-2.ddl b/tools/testfiles/tgroup-2.ddl index 2ac8ac6..5374742 100644 --- a/tools/testfiles/tgroup-2.ddl +++ b/tools/testfiles/tgroup-2.ddl @@ -17,14 +17,7 @@ GROUP "/" { } } GROUP "g2" { - GROUP "g2.1" { - GROUP "g2.1.1" { - } - GROUP "g2.1.2" { - } - GROUP "g2.1.3" { - } - } + HARDLINK "/g2" } GROUP "g3" { GROUP "g3.1" { |