fix nil pointer dereference (#13221)

28250271 · Mitsuhiro Tanda · Torkel Ödegaard · 2936e34d · 28250271
Commit 28250271 authored Sep 11, 2018 by Mitsuhiro Tanda Committed by Torkel Ödegaard Sep 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

pkg/tsdb/cloudwatch/metric_find_query.go
+3 -0

No files found.
--- 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