fix(opinit): avoid null ptr in calling unmarshal

traviolus · traviolus · commit 78c5bcbfc2c8 · 2025-02-04T11:10:42.000+07:00
diff --git a/cmd/opinit_bots.go b/cmd/opinit_bots.go
@@ -214,8 +214,8 @@ func readAndUnmarshalKeyFile(keyFilePath string) (*weaveio.KeyFile, error) {
 		return nil, err
 	}
 
-	var keyFile *weaveio.KeyFile
-	err = json.Unmarshal(fileData, &keyFile)
+	keyFile := &weaveio.KeyFile{}
+	err = json.Unmarshal(fileData, keyFile)
 	return keyFile, err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -214,8 +214,8 @@ func readAndUnmarshalKeyFile(keyFilePath string) (*weaveio.KeyFile, error) {`
`214`	`214`	`return nil, err`
`215`	`215`	`}`
`216`	`216`
`217`		`- var keyFile *weaveio.KeyFile`
`218`		`- err = json.Unmarshal(fileData, &keyFile)`
	`217`	`+ keyFile := &weaveio.KeyFile{}`
	`218`	`+ err = json.Unmarshal(fileData, keyFile)`
`219`	`219`	`return keyFile, err`
`220`	`220`	`}`
`221`	`221`