Merge pull request #217 from AnPiakhota-Infoblox/fix-gen-code-issues

Fix nil pointer dereference in gen code
infobloxopen · Sep 17, 2021 · 51b6c18 · 51b6c18
2 parents 200aa50 + 6bb646c
commit 51b6c18
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/example/feature_demo/demo_types.pb.gorm.go b/example/feature_demo/demo_types.pb.gorm.go
@@ -66,7 +66,8 @@ func (m *TestTypes) ToORM(ctx context.Context) (TestTypesORM, error) {
 		to.Uuid = go_uuid.Nil
 	}
 	if m.CreatedAt != nil {
-		*to.CreatedAt = m.CreatedAt.AsTime()
+		t := m.CreatedAt.AsTime()
+		to.CreatedAt = &t
 	}
 	to.TypeWithIdId = m.TypeWithIdId
 	if m.JsonField != nil {
@@ -240,7 +241,8 @@ func (m *TypeWithID) ToORM(ctx context.Context) (TypeWithIDORM, error) {
 		}
 	}
 	if m.DeletedAt != nil {
-		*to.DeletedAt = m.DeletedAt.AsTime()
+		t := m.DeletedAt.AsTime()
+		to.DeletedAt = &t
 	}
 	if posthook, ok := interface{}(m).(TypeWithIDWithAfterToORM); ok {
 		err = posthook.AfterToORM(ctx, &to)

diff --git a/example/user/user.pb.gorm.go b/example/user/user.pb.gorm.go
@@ -55,13 +55,16 @@ func (m *User) ToORM(ctx context.Context) (UserORM, error) {
 		to.Id = v.(string)
 	}
 	if m.CreatedAt != nil {
-		*to.CreatedAt = m.CreatedAt.AsTime()
+		t := m.CreatedAt.AsTime()
+		to.CreatedAt = &t
 	}
 	if m.UpdatedAt != nil {
-		*to.UpdatedAt = m.UpdatedAt.AsTime()
+		t := m.UpdatedAt.AsTime()
+		to.UpdatedAt = &t
 	}
 	if m.Birthday != nil {
-		*to.Birthday = m.Birthday.AsTime()
+		t := m.Birthday.AsTime()
+		to.Birthday = &t
 	}
 	to.Num = m.Num
 	if m.CreditCard != nil {
@@ -651,10 +654,12 @@ func (m *CreditCard) ToORM(ctx context.Context) (CreditCardORM, error) {
 		to.Id = v
 	}
 	if m.CreatedAt != nil {
-		*to.CreatedAt = m.CreatedAt.AsTime()
+		t := m.CreatedAt.AsTime()
+		to.CreatedAt = &t
 	}
 	if m.UpdatedAt != nil {
-		*to.UpdatedAt = m.UpdatedAt.AsTime()
+		t := m.UpdatedAt.AsTime()
+		to.UpdatedAt = &t
 	}
 	to.Number = m.Number
 	if m.UserId != nil {

diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -1411,7 +1411,8 @@ func (b *ORMBuilder) generateFieldConversion(message *protogen.Message, field *p
 		} else if fieldType == protoTypeTimestamp { // Singular WKT Timestamp ---
 			if toORM {
 				g.P(`if m.`, fieldName, ` != nil {`)
-				g.P(`*to.`, fieldName, ` = m.`, fieldName, `.AsTime()`)
+				g.P(`t := m.`, fieldName, `.AsTime()`)
+				g.P(`to.`, fieldName, ` = &t`)
 				g.P(`}`)
 			} else {
 				g.P(`if m.`, fieldName, ` != nil {`)