From 76dd1a221599d560e2780cbf79e31ad06341581e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 5 Aug 2022 05:51:30 +0300 Subject: [PATCH 04/15] Do not silently ignore invalid range Invalid range causes the default range to get used. Log when that happens. See osdn #44710 Signed-off-by: Marko Lindqvist --- common/requirements.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/common/requirements.c b/common/requirements.c index a46cebd3ef..a45024f9ef 100644 --- a/common/requirements.c +++ b/common/requirements.c @@ -692,10 +692,20 @@ struct requirement req_from_str(const char *type, const char *range, if (invalid) { error = "bad type or name"; } else { + bool range_selected = FALSE; + /* Scan the range string to find the range. If no range is given a * default fallback is used rather than giving an error. */ - req.range = req_range_by_name(range, fc_strcasecmp); - if (!req_range_is_valid(req.range)) { + if (range != NULL) { + req.range = req_range_by_name(range, fc_strcasecmp); + if (req_range_is_valid(req.range)) { + range_selected = TRUE; + } else { + log_normal("Unknown requirement range \"%s\", falling back to default one.", + range); + } + } + if (!range_selected) { switch (req.source.kind) { case VUT_NONE: case VUT_COUNT: -- 2.35.1