[PATCH v3 03/18] grep: submodule-related case statements should die if new fields are added
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Apr 20, 2017, 21:23 UTC
- Message-ID
- <20170420212345.7408-4-avarab@gmail.com>
- In-Reply-To
- <20170420212345.7408-1-avarab@gmail.com>
Change two case statements added in commit 0281e487fd ("grep: optionally recurse into submodules", 2016-12-16) so that they die if new GREP_PATTERN_* enum fields are added without updating them.
These case statements currently check for an exhaustive list of fields, but if a new field is added it's easy to introduce a bug here where the code will start subtly doing the wrong thing, e.g. if a new pattern type is added we'll fall through to GREP_PATTERN_TYPE_UNSPECIFIED, i.e. the "basic" POSIX regular expressions.
This should arguably be done for the switch(opt->binary) case-statement as well, but isn't trivial to add since that code isn't currently working with an exhaustive list.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/grep.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/builtin/grep.c b/builtin/grep.c index 3ffb5b4e81..be3dbd6957 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -495,6 +495,8 @@ static void compile_submodule_options(const struct grep_opt *opt, break; case GREP_PATTERN_TYPE_UNSPECIFIED: break; + default: + die("BUG: Added a new grep pattern type without updating switch statement"); } for (pattern = opt->pattern_list; pattern != NULL; @@ -515,6 +517,8 @@ static void compile_submodule_options(const struct grep_opt *opt, case GREP_PATTERN_BODY: case GREP_PATTERN_HEAD: break; + default: + die("BUG: Added a new grep token type without updating case statement"); } }
-- 2.11.0