diff options
| author | René Scharfe <l.s.r@web.de> | 2025-07-09 11:46:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-09 08:39:46 -0700 |
| commit | 1d918bf2a5eb9d860df1dd115ef2641d7b5870e9 (patch) | |
| tree | 37a7b380e633b97199735c42a418c4982040f9ad /parse-options.c | |
| parent | parse-options: add precision handling for OPTION_NEGBIT (diff) | |
| download | git-1d918bf2a5eb9d860df1dd115ef2641d7b5870e9.tar.gz git-1d918bf2a5eb9d860df1dd115ef2641d7b5870e9.zip | |
parse-options: add precision handling for OPTION_BITOP
Similar to 09705696f7 (parse-options: introduce precision handling for
`OPTION_INTEGER`, 2025-04-17) support value variables of different sizes
for OPTION_BITOP. Do that by requiring their "precision" to be set,
casting their "value" pointer accordingly and checking whether the value
fits.
Check if "devfal" fits into an integer variable with the given
"precision", but don't check "extra", as its value is only used to clear
bits, so cannot lead to an overflow. Not checking continues to allow
e.g., using -1 to clear all bits even if the value variable has a
narrower type than intptr_t.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/parse-options.c b/parse-options.c index ba89dc4d09..a813511b1b 100644 --- a/parse-options.c +++ b/parse-options.c @@ -167,11 +167,14 @@ static enum parse_opt_result do_get_value(struct parse_opt_ctx_t *p, } case OPTION_BITOP: + { + intmax_t value = get_int_value(opt, flags); if (unset) BUG("BITOP can't have unset form"); - *(int *)opt->value &= ~opt->extra; - *(int *)opt->value |= opt->defval; - return 0; + value &= ~opt->extra; + value |= opt->defval; + return set_int_value(opt, flags, value); + } case OPTION_COUNTUP: if (*(int *)opt->value < 0) @@ -647,12 +650,12 @@ static void parse_options_check(const struct option *opts) case OPTION_SET_INT: case OPTION_BIT: case OPTION_NEGBIT: + case OPTION_BITOP: if (!signed_int_fits(opts->defval, opts->precision)) optbug(opts, "has invalid defval"); /* fallthru */ case OPTION_COUNTUP: case OPTION_NUMBER: - case OPTION_BITOP: if ((opts->flags & PARSE_OPT_OPTARG) || !(opts->flags & PARSE_OPT_NOARG)) optbug(opts, "should not accept an argument"); |