From 28250271ccafccd5547af0f418729a911ce846c5 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Tue, 11 Sep 2018 19:53:39 +0900 Subject: [PATCH] fix nil pointer dereference (#13221) --- pkg/tsdb/cloudwatch/metric_find_query.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go index ef1b53eaf1b..e1e131d9f3a 100644 --- a/pkg/tsdb/cloudwatch/metric_find_query.go +++ b/pkg/tsdb/cloudwatch/metric_find_query.go @@ -466,6 +466,9 @@ func (e *CloudWatchExecutor) handleGetEc2InstanceAttribute(ctx context.Context, return nil, errors.New("invalid attribute path") } v = v.FieldByName(key) + if !v.IsValid() { + return nil, errors.New("invalid attribute path") + } } if attr, ok := v.Interface().(*string); ok { data = *attr