fix another null pointer dereference in S3

rebuy-de · Nov 3, 2017 · 9e390b5 · 9e390b5
1 parent 45fce27
commit 9e390b5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/resources/s3-buckets.go b/resources/s3-buckets.go
@@ -25,7 +25,7 @@ func (n *S3Nuke) DescribeBuckets() ([]string, error) {
 			return nil, err
 		}
 
-		if *bucketLocationResponse.LocationConstraint == *n.Service.Config.Region {
+		if EqualStringPtr(bucketLocationResponse.LocationConstraint, n.Service.Config.Region) {
 			buckets = append(buckets, *out.Name)
 		}
 

diff --git a/resources/util.go b/resources/util.go
@@ -8,3 +8,15 @@ import (
 func GetCategory(r Resource) string {
 	return strings.Split(fmt.Sprintf("%T", r), ".")[1] // hackey
 }
+
+func EqualStringPtr(v1, v2 *string) bool {
+	if v1 == nil && v2 == nil {
+		return true
+	}
+
+	if v1 == nil || v2 == nil {
+		return false
+	}
+
+	return *v1 == *v2
+}