Merge pull request #3434 from howardjohn/json/unmarshal-pointer

thaJeztah · web-flow · commit df7adf4aa3bf · 2022-02-25T12:06:10.000+01:00
Fix incorrect pointer inputs to `json.Unmarshal`
diff --git a/cli/config/configfile/file.go b/cli/config/configfile/file.go
@@ -113,7 +113,7 @@ func (configFile *ConfigFile) LegacyLoadFromReader(configData io.Reader) error {
 // LoadFromReader reads the configuration data given and sets up the auth config
 // information with given directory and populates the receiver object
 func (configFile *ConfigFile) LoadFromReader(configData io.Reader) error {
-	if err := json.NewDecoder(configData).Decode(&configFile); err != nil && !errors.Is(err, io.EOF) {
+	if err := json.NewDecoder(configData).Decode(configFile); err != nil && !errors.Is(err, io.EOF) {
 		return err
 	}
 	var err error

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func (configFile *ConfigFile) LegacyLoadFromReader(configData io.Reader) error {`
`113`	`113`	`// LoadFromReader reads the configuration data given and sets up the auth config`
`114`	`114`	`// information with given directory and populates the receiver object`
`115`	`115`	`func (configFile *ConfigFile) LoadFromReader(configData io.Reader) error {`
`116`		`- if err := json.NewDecoder(configData).Decode(&configFile); err != nil && !errors.Is(err, io.EOF) {`
	`116`	`+ if err := json.NewDecoder(configData).Decode(configFile); err != nil && !errors.Is(err, io.EOF) {`
`117`	`117`	`return err`
`118`	`118`	`}`
`119`	`119`	`var err error`