Merge pull request #43 from rerorero/fix-ptr-in-struct

Avoid nil reference when struct has gen.PtrOf field
leanovate · Oct 20, 2018 · 55d63c2 · 55d63c2
2 parents 0bdcb15 + 49faad1
commit 55d63c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/gen/struct.go b/gen/struct.go
@@ -38,7 +38,11 @@ func Struct(rt reflect.Type, gens map[string]gopter.Gen) gopter.Gen {
 			if !ok {
 				return gopter.NewEmptyResult(rt)
 			}
-			result.Elem().FieldByIndex(field.Index).Set(reflect.ValueOf(value))
+			if value == nil {
+				result.Elem().FieldByIndex(field.Index).Set(reflect.Zero(field.Type))
+			} else {
+				result.Elem().FieldByIndex(field.Index).Set(reflect.ValueOf(value))
+			}
 		}
 
 		return gopter.NewGenResult(reflect.Indirect(result).Interface(), gopter.NoShrinker)

diff --git a/gen/struct_test.go b/gen/struct_test.go
@@ -13,6 +13,7 @@ type testStruct struct {
 	Value2 int64
 	Value3 []int8
 	Value4 string
+	Value5 *string
 }
 
 func TestStruct(t *testing.T) {
@@ -21,6 +22,7 @@ func TestStruct(t *testing.T) {
 		"Value2":   gen.Int64(),
 		"Value3":   gen.SliceOf(gen.Int8()),
 		"NotThere": gen.AnyString(),
+		"Value5": gen.PtrOf(gen.Const("v5")),
 	})
 	for i := 0; i < 100; i++ {
 		value, ok := structGen.Sample()
@@ -29,7 +31,7 @@ func TestStruct(t *testing.T) {
 			t.Errorf("Invalid value: %#v", value)
 		}
 		v, ok := value.(testStruct)
-		if !ok || v.Value1 == "" || v.Value3 == nil || v.Value4 != "" {
+		if !ok || v.Value1 == "" || v.Value3 == nil || v.Value4 != "" || !(v.Value5 == nil || *v.Value5  == "v5"){
 			t.Errorf("Invalid value: %#v", value)
 		}
 	}