summaryrefslogtreecommitdiffstats
path: root/tools/src/h5repack/h5repack_copy.c
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-10-09 17:59:28 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-10-09 17:59:28 (GMT)
commitdaddf169b078f2c3982af513416e7f0f9208a211 (patch)
tree0fcf0403d46599b3867cb37fabae528215b97162 /tools/src/h5repack/h5repack_copy.c
parenta07d6b52fb0a231c2c6e60b1ae4d7550894c4b58 (diff)
downloadhdf5-daddf169b078f2c3982af513416e7f0f9208a211.zip
hdf5-daddf169b078f2c3982af513416e7f0f9208a211.tar.gz
hdf5-daddf169b078f2c3982af513416e7f0f9208a211.tar.bz2
HDFFV-10297 - Fix test errors - five remaining
Diffstat (limited to 'tools/src/h5repack/h5repack_copy.c')
-rw-r--r--tools/src/h5repack/h5repack_copy.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 08bce60..9fcf218 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -698,6 +698,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
unsigned crt_order_flags; /* group creation order flag */
unsigned i;
unsigned u;
+ unsigned uf;
int is_ref = 0;
htri_t is_named;
hbool_t limit_maxdims;
@@ -803,8 +804,10 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
if (options->op_tbl->objs) {
for (u = 0; u < options->op_tbl->nelems; u++) {
if (HDstrcmp(travt->objs[i].name, options->op_tbl->objs[u].path) == 0)
- if (options->op_tbl->objs[u].filter->filtn > 0)
- req_filter = 1;
+ for (uf = 0; uf < options->op_tbl->objs[uf].nfilters; uf++) {
+ if (options->op_tbl->objs[u].filter[uf].filtn > 0)
+ req_filter = 1;
+ }
}
}
@@ -1293,7 +1296,7 @@ done:
HDfree(hslab_buf);
/* Finalize (link) the stack of named datatypes (if any) */
- if (0 == ret_value)
+ if (0 == ret_value && named_dt_head != NULL)
named_datatype_free(&named_dt_head, 0);
else
H5E_BEGIN_TRY {