From 5c5ee2cc70a0c7ad589494fa9edc0fb44ace9bdf Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Wed, 18 Oct 2023 09:37:57 +0000 Subject: [PATCH] fix: nil pointer dereference in query builder expression (#3764) --- pkg/query-service/app/queryBuilder/query_builder.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/query-service/app/queryBuilder/query_builder.go b/pkg/query-service/app/queryBuilder/query_builder.go index 51d2fce667..dedcff1f10 100644 --- a/pkg/query-service/app/queryBuilder/query_builder.go +++ b/pkg/query-service/app/queryBuilder/query_builder.go @@ -247,7 +247,11 @@ func (qb *QueryBuilder) PrepareQueries(params *v3.QueryRangeParamsV3, args ...in // Build queries for each expression for _, query := range compositeQuery.BuilderQueries { if query.Expression != query.QueryName { - expression, _ := govaluate.NewEvaluableExpressionWithFunctions(query.Expression, EvalFuncs) + expression, err := govaluate.NewEvaluableExpressionWithFunctions(query.Expression, EvalFuncs) + + if err != nil { + return nil, err + } queryString, err := expressionToQuery(params, queries, expression, query.QueryName) if err != nil {