encryptFields: check for nil field or digest

johnstcn · johnstcn · commit 46b1ff4920ea · 2023-09-05T15:30:55.000Z
diff --git a/enterprise/dbcrypt/dbcrypt.go b/enterprise/dbcrypt/dbcrypt.go
@@ -270,7 +270,10 @@ func (db *dbCrypt) encryptField(field *string, digest *sql.NullString) error {
 	}
 
 	if field == nil {
-		return nil
+		return xerrors.Errorf("developer error: encryptField called with nil field")
+	}
+	if digest == nil {
+		return xerrors.Errorf("developer error: encryptField called with nil digest")
 	}
 
 	encrypted, err := db.ciphers[db.primaryCipherDigest].Encrypt([]byte(*field))

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,10 @@ func (db dbCrypt) encryptField(field string, digest *sql.NullString) error {`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`if field == nil {`
`273`		`- return nil`
	`273`	`+ return xerrors.Errorf("developer error: encryptField called with nil field")`
	`274`	`+ }`
	`275`	`+ if digest == nil {`
	`276`	`+ return xerrors.Errorf("developer error: encryptField called with nil digest")`
`274`	`277`	`}`
`275`	`278`
`276`	`279`	`encrypted, err := db.ciphers[db.primaryCipherDigest].Encrypt([]byte(*field))`