Skip to content

h5repack: fix silent loss of a declared cd_nelmts for UD filters #6466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brtnfld wants to merge 2 commits into
base: develop
Choose a base branch
from
+26 −3
Open

h5repack: fix silent loss of a declared cd_nelmts for UD filters #6466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f750e26
h5repack: fix silent loss of a declared cd_nelmts for UD filters
brtnfld Jun 19, 2026
c1ec6e8
Merge branch 'develop' into fix/h5repack-ud-cd-nelmts
hyoklee Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions release_docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,15 @@ The `h5repack` tool now obtains its default low and high library version bounds

## Tools

### Fixed h5repack silently dropping a declared cd_nelmts for user-defined filters

`h5repack -f UD=<filtn>,<flag>,<cd_nelmts>` with no values following `cd_nelmts` silently
treated the declared count as 0 instead of validating it, because the trailing token (with
no comma after it) was never committed to `cd_nelmts` inside the parser. `parse_filter()` now
commits the trailing token to whichever UD field is still pending, so a declared, unfulfilled
`cd_nelmts` is correctly rejected with "incorrect number of compression parameters" instead of
being silently coerced to 0.

## Performance

## Fortran API
Expand Down
17 changes: 14 additions & 3 deletions tools/src/h5repack/h5repack_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
size_t i, m, u;
char c;
size_t len = strlen(str);
int f, k, l, p, q, end_obj = -1, no_param = 0;
int f = -1, k, l = -1, p = -1, q, end_obj = -1, no_param = 0;
unsigned j, n;
char sobj[MAX_NC_NAME];
char scomp[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
Expand Down Expand Up @@ -297,8 +297,19 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
} /*if */

done_filter_params:;
if ((strcmp(scomp, "UD") == 0) && (filt->cd_nelmts == 0))
j = 0;
if (strcmp(scomp, "UD") == 0) {
/* the trailing token (no comma after it) was never committed inside
* the loop above; commit it to whichever UD field is still pending,
* mirroring the comma-triggered branch exactly */
if (l == -1)
filt->filtn = atoi(stype);
else if (f == -1)
filt->filt_flag = (unsigned)strtoul(stype, NULL, 0);
else if (p == -1)
filt->cd_nelmts = strtoull(stype, NULL, 0);
else if (filt->cd_nelmts > 0)
filt->cd_values[j++] = (unsigned)strtoul(stype, NULL, 0);
}
else
filt->cd_values[j++] = (unsigned)strtoul(stype, NULL, 0);
}
Expand Down
3 changes: 3 additions & 0 deletions tools/test/h5repack/CMakeTests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1892,6 +1892,9 @@ if (BUILD_SHARED_LIBS)
ADD_H5_UD_TEST (plugin_test_ex 1 h5repack_layout.h5 --enable-error-stack -v -f UD=257,0,1,9,9,9)
# check for extra parameters, which are ignored when nelms is 0
ADD_H5_UD_TEST (plugin_zero_extra 0 h5repack_layout.h5 --enable-error-stack -v -f UD=250,0,0,1,2)
# check for a declared cd_nelmts with no values following it (filter 250 does no
# internal cd_values validation, so this only fails if parse_filter() catches it itself)
ADD_H5_UD_TEST (plugin_test_nelmts_no_values 1 h5repack_layout.h5 --enable-error-stack -v -f UD=250,0,1)
endif ()

##############################################################################
Expand Down
Loading